Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2013-04-11 | 7 | -21/+20 |
|\ | |||||
| * | Typo fix: replacing it's -> its | Benoit Bourbie | 2013-04-11 | 2 | -3/+3 |
| * | t: make PIPE a standard test prerequisite | Adam Spiers | 2013-04-11 | 4 | -16/+10 |
| * | archive: clarify explanation of --worktree-attributes | René Scharfe | 2013-04-11 | 1 | -1/+3 |
| * | t/README: --immediate skips cleanup commands for failed tests | Simon Ruderich | 2013-04-09 | 1 | -1/+4 |
* | | Update dtaft release notes to 1.8.3 | Junio C Hamano | 2013-04-11 | 1 | -6/+21 |
* | | Merge branch 'ap/combine-diff-coalesce-lost' | Junio C Hamano | 2013-04-11 | 2 | -64/+320 |
|\ \ | |||||
| * | | combine-diff: coalesce lost lines optimally | Antoine Pelisse | 2013-03-25 | 2 | -64/+320 |
* | | | Merge branch 'sr/log-SG-no-textconv' | Junio C Hamano | 2013-04-11 | 2 | -72/+86 |
|\ \ \ | |||||
| * | | | diffcore-pickaxe: unify code for log -S/-G | Jeff King | 2013-04-05 | 1 | -69/+49 |
| * | | | diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" | Junio C Hamano | 2013-04-05 | 1 | -5/+7 |
| * | | | diffcore-pickaxe: port optimization from has_changes() to diff_grep() | Junio C Hamano | 2013-04-05 | 1 | -1/+6 |
| * | | | diffcore-pickaxe: respect --no-textconv | Simon Ruderich | 2013-04-05 | 2 | -4/+36 |
| * | | | diffcore-pickaxe: remove fill_one() | Jeff King | 2013-04-04 | 1 | -20/+10 |
| * | | | diffcore-pickaxe: remove unnecessary call to get_textconv() | Simon Ruderich | 2013-04-04 | 1 | -9/+14 |
* | | | | Merge branch 'js/rerere-forget-protect-against-NUL' | Junio C Hamano | 2013-04-11 | 2 | -10/+36 |
|\ \ \ \ | |||||
| * | | | | rerere forget: do not segfault if not all stages are present | Johannes Sixt | 2013-04-04 | 2 | -8/+20 |
| * | | | | rerere forget: grok files containing NUL | Johannes Sixt | 2013-04-02 | 2 | -2/+16 |
* | | | | | Merge branch 'po/help-guides' | Junio C Hamano | 2013-04-11 | 3 | -10/+68 |
|\ \ \ \ \ | |||||
| * | | | | | doc: include --guide option description for "git help" | Philip Oakley | 2013-04-03 | 1 | -7/+21 |
| * | | | | | help: mention -a and -g option, and 'git help <concept>' usage. | Philip Oakley | 2013-04-02 | 1 | -1/+3 |
| * | | | | | builtin/help.c: add list_common_guides_help() function | Philip Oakley | 2013-04-02 | 1 | -3/+33 |
| * | | | | | builtin/help.c: add --guide option | Philip Oakley | 2013-04-02 | 1 | -2/+8 |
| * | | | | | builtin/help.c: split "-a" processing into two | Philip Oakley | 2013-04-02 | 1 | -1/+7 |
* | | | | | | remote-bzr: improve tag handling | Felipe Contreras | 2013-04-08 | 1 | -9/+16 |
* | | | | | | remote-bzr: fix utf-8 support for fetching | Christophe Simonis | 2013-04-08 | 2 | -9/+19 |
* | | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,... | Junio C Hamano | 2013-04-08 | 2 | -28/+11 |
* | | | | | | Sync with 1.8.2.1 | Junio C Hamano | 2013-04-07 | 4 | -3/+15 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Git 1.8.2.1v1.8.2.1 | Junio C Hamano | 2013-04-07 | 3 | -2/+8 |
| * | | | | | Sync with 1.8.1.6 | Junio C Hamano | 2013-04-07 | 6 | -21/+99 |
| |\ \ \ \ \ | |||||
| | * | | | | | Git 1.8.1.6v1.8.1.6 | Junio C Hamano | 2013-04-07 | 3 | -2/+8 |
| | * | | | | | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 | Junio C Hamano | 2013-04-07 | 3 | -17/+89 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | remote-helpers/test-bzr.sh: do not use "grep '\s'" | Torsten Bögershausen | 2013-04-07 | 1 | -1/+1 |
* | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-04-07 | 1 | -0/+20 |
* | | | | | | | | Merge branch 'jk/rm-removed-paths' | Junio C Hamano | 2013-04-07 | 3 | -2/+67 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3600: document failure of rm across symbolic links | Jeff King | 2013-04-04 | 1 | -0/+28 |
| * | | | | | | | | t3600: test behavior of reverse-d/f conflict | Jeff King | 2013-04-04 | 1 | -0/+12 |
| * | | | | | | | | rm: do not complain about d/f conflicts during deletion | Jeff King | 2013-04-04 | 3 | -2/+27 |
* | | | | | | | | | Merge branch 'tb/shared-perm' | Junio C Hamano | 2013-04-07 | 2 | -35/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | path.c: optimize adjust_shared_perm() | Torsten Bögershausen | 2013-04-05 | 1 | -19/+23 |
| * | | | | | | | | | path.c: simplify adjust_shared_perm() | Torsten Bögershausen | 2013-04-05 | 2 | -22/+8 |
* | | | | | | | | | | Merge branch 'cn/commit-amend-doc' | Junio C Hamano | 2013-04-07 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation/git-commit: reword the --amend explanation | Carlos Martín Nieto | 2013-04-05 | 1 | -8/+9 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fc/remote-helpers-test-updates' | Junio C Hamano | 2013-04-07 | 3 | -16/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remote-hg: fix hg-git test-case | Felipe Contreras | 2013-04-04 | 1 | -1/+0 |
| * | | | | | | | | | | remote-bzr: remove stale check code for tests | Felipe Contreras | 2013-04-04 | 1 | -14/+0 |
| * | | | | | | | | | | remote-helpers: fix the run of all tests | Felipe Contreras | 2013-04-04 | 1 | -0/+1 |
| * | | | | | | | | | | remote-bzr: avoid echo -n | Felipe Contreras | 2013-04-04 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'mg/texinfo-5' | Junio C Hamano | 2013-04-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Documentation: Strip texinfo anchors to avoid duplicates | Martin von Gagern | 2013-04-03 | 1 | -0/+1 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | |