summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-helpJunio C Hamano2018-01-171-1/+1
* Merge branch 'tg/worktree-create-tracking'Junio C Hamano2017-12-198-51/+277
|\
| * add worktree.guessRemote config optionThomas Gummerer2017-12-064-2/+56
| * worktree: add --guess-remote flag to add subcommandThomas Gummerer2017-12-063-0/+46
| * worktree: make add <path> <branch> dwimThomas Gummerer2017-11-273-0/+43
| * worktree: add --[no-]track option to the add subcommandThomas Gummerer2017-11-273-0/+65
| * worktree: add can be created from any commit-ishThomas Gummerer2017-11-271-10/+10
| * checkout: factor out functions to new lib fileThomas Gummerer2017-11-274-40/+58
* | Merge branch 'gk/tracing-optimization'Junio C Hamano2017-12-192-40/+48
|\ \
| * | trace: improve performance while category is disabledgk/tracing-optimizationGennady Kupava2017-12-062-20/+42
| * | trace: remove trace key normalizationGennady Kupava2017-11-272-21/+7
| |/
* | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-12-192-0/+19
|\ \
| * | diff-tree: read the index so attribute checks work in bare repositoriesbw/submodule-config-cleanupBrandon Williams2017-12-062-0/+19
* | | Merge branch 'sb/clone-recursive-submodule-doc'Junio C Hamano2017-12-191-8/+11
|\ \ \
| * | | Documentation/git-clone: improve description for submodule recursingsb/clone-recursive-submodule-docStefan Beller2017-12-051-8/+11
* | | | Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano2017-12-191-3/+9
|\ \ \ \
| * \ \ \ Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no...ls/git-gui-no-double-utf8-author-nameJunio C Hamano2017-12-051-3/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | git-gui: prevent double UTF-8 conversionƁukasz Stelmach2017-12-051-3/+9
* | | | | Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano2017-12-194-2/+24
|\ \ \ \ \
| * | | | | pathspec: only match across submodule boundaries when requestedbw/pathspec-match-submodule-boundaryBrandon Williams2017-12-054-2/+24
* | | | | | Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-196-7/+169
|\ \ \ \ \ \
| * | | | | | diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-286-7/+169
* | | | | | | Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano2017-12-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive: ignore_case shouldn't reject intentional removalsen/merge-recursive-icase-removalElijah Newren2017-11-271-1/+1
* | | | | | | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-196-27/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: make diff-tree -l0 mean -l<large>en/rename-progressJonathan Tan2017-12-022-0/+17
| * | | | | | | | sequencer: show rename progress during cherry picksElijah Newren2017-11-151-0/+1
| * | | | | | | | diff: remove silent clamp of renameLimitElijah Newren2017-11-152-8/+5
| * | | | | | | | progress: fix progress meters when dealing with lots of workElijah Newren2017-11-153-20/+21
| * | | | | | | | sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren2017-11-141-0/+1
* | | | | | | | | RelNotes: minor typo fixes in 2.16.0 draftTodd Zullinger2017-12-141-2/+2
* | | | | | | | | RelNotes: the ninth batchJunio C Hamano2017-12-131-0/+31
* | | | | | | | | Merge branch 'js/hashmap-update-sample'Junio C Hamano2017-12-131-31/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hashmap: adjust documentation to reflect realityjs/hashmap-update-sampleJohannes Schindelin2017-12-051-31/+29
* | | | | | | | | | Merge branch 'en/remove-stripspace'Junio C Hamano2017-12-131-9/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | strbuf: remove unused stripspace function aliasen/remove-stripspaceElijah Newren2017-12-051-9/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-12-131-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-status.txt: mention --no-optional-locksjk/no-optional-locksJeff King2017-11-271-0/+13
* | | | | | | | | | | Merge branch 'ds/for-each-file-in-obj-micro-optim'Junio C Hamano2017-12-132-5/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1_file: use strbuf_add() instead of strbuf_addf()ds/for-each-file-in-obj-micro-optimDerrick Stolee2017-12-042-5/+11
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/progress-delay-fix'Junio C Hamano2017-12-131-19/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | progress: drop delay-threshold codejk/progress-delay-fixLars Schneider2017-12-041-19/+5
| * | | | | | | | | | | progress: set default delay threshold to 100%, not 0%Jeff King2017-12-041-1/+1
* | | | | | | | | | | | Merge branch 'ks/doc-checkout-previous'Junio C Hamano2017-12-131-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc/checkout: checking out using @{-N} can lead to detached stateks/doc-checkout-previousKaartic Sivaraam2017-11-281-4/+4
* | | | | | | | | | | | | Merge branch 'fk/sendmail-from-path'Junio C Hamano2017-12-132-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-send-email: honor $PATH for sendmail binaryfk/sendmail-from-pathFlorian Klink2017-11-282-4/+6
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tg/t-readme-updates'Junio C Hamano2017-12-131-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/README: document test_cmp_revtg/t-readme-updatesThomas Gummerer2017-11-271-0/+5
| * | | | | | | | | | | | | t/README: remove mention of adding copyright noticesThomas Gummerer2017-11-271-4/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |