Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | worktree: say that "add" takes an arbitrary commit in short-helpjc/worktree-add-short-help | Junio C Hamano | 2018-01-17 | 1 | -1/+1 |
* | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2017-12-19 | 8 | -51/+277 |
|\ | |||||
| * | add worktree.guessRemote config option | Thomas Gummerer | 2017-12-06 | 4 | -2/+56 |
| * | worktree: add --guess-remote flag to add subcommand | Thomas Gummerer | 2017-12-06 | 3 | -0/+46 |
| * | worktree: make add <path> <branch> dwim | Thomas Gummerer | 2017-11-27 | 3 | -0/+43 |
| * | worktree: add --[no-]track option to the add subcommand | Thomas Gummerer | 2017-11-27 | 3 | -0/+65 |
| * | worktree: add can be created from any commit-ish | Thomas Gummerer | 2017-11-27 | 1 | -10/+10 |
| * | checkout: factor out functions to new lib file | Thomas Gummerer | 2017-11-27 | 4 | -40/+58 |
* | | Merge branch 'gk/tracing-optimization' | Junio C Hamano | 2017-12-19 | 2 | -40/+48 |
|\ \ | |||||
| * | | trace: improve performance while category is disabledgk/tracing-optimization | Gennady Kupava | 2017-12-06 | 2 | -20/+42 |
| * | | trace: remove trace key normalization | Gennady Kupava | 2017-11-27 | 2 | -21/+7 |
| |/ | |||||
* | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-12-19 | 2 | -0/+19 |
|\ \ | |||||
| * | | diff-tree: read the index so attribute checks work in bare repositoriesbw/submodule-config-cleanup | Brandon Williams | 2017-12-06 | 2 | -0/+19 |
* | | | Merge branch 'sb/clone-recursive-submodule-doc' | Junio C Hamano | 2017-12-19 | 1 | -8/+11 |
|\ \ \ | |||||
| * | | | Documentation/git-clone: improve description for submodule recursingsb/clone-recursive-submodule-doc | Stefan Beller | 2017-12-05 | 1 | -8/+11 |
* | | | | Merge branch 'ls/git-gui-no-double-utf8-author-name' | Junio C Hamano | 2017-12-19 | 1 | -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-name | Junio C Hamano | 2017-12-05 | 1 | -3/+9 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | git-gui: prevent double UTF-8 conversion | Ćukasz Stelmach | 2017-12-05 | 1 | -3/+9 |
* | | | | | Merge branch 'bw/pathspec-match-submodule-boundary' | Junio C Hamano | 2017-12-19 | 4 | -2/+24 |
|\ \ \ \ \ | |||||
| * | | | | | pathspec: only match across submodule boundaries when requestedbw/pathspec-match-submodule-boundary | Brandon Williams | 2017-12-05 | 4 | -2/+24 |
* | | | | | | Merge branch 'jt/diff-anchored-patience' | Junio C Hamano | 2017-12-19 | 6 | -7/+169 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: support anchoring line(s)jt/diff-anchored-patience | Jonathan Tan | 2017-11-28 | 6 | -7/+169 |
* | | | | | | | Merge branch 'en/merge-recursive-icase-removal' | Junio C Hamano | 2017-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge-recursive: ignore_case shouldn't reject intentional removalsen/merge-recursive-icase-removal | Elijah Newren | 2017-11-27 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'en/rename-progress' | Junio C Hamano | 2017-12-19 | 6 | -27/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diffcore-rename: make diff-tree -l0 mean -l<large>en/rename-progress | Jonathan Tan | 2017-12-02 | 2 | -0/+17 |
| * | | | | | | | | sequencer: show rename progress during cherry picks | Elijah Newren | 2017-11-15 | 1 | -0/+1 |
| * | | | | | | | | diff: remove silent clamp of renameLimit | Elijah Newren | 2017-11-15 | 2 | -8/+5 |
| * | | | | | | | | progress: fix progress meters when dealing with lots of work | Elijah Newren | 2017-11-15 | 3 | -20/+21 |
| * | | | | | | | | sequencer: warn when internal merge may be suboptimal due to renameLimit | Elijah Newren | 2017-11-14 | 1 | -0/+1 |
* | | | | | | | | | RelNotes: minor typo fixes in 2.16.0 draft | Todd Zullinger | 2017-12-14 | 1 | -2/+2 |
* | | | | | | | | | RelNotes: the ninth batch | Junio C Hamano | 2017-12-13 | 1 | -0/+31 |
* | | | | | | | | | Merge branch 'js/hashmap-update-sample' | Junio C Hamano | 2017-12-13 | 1 | -31/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | hashmap: adjust documentation to reflect realityjs/hashmap-update-sample | Johannes Schindelin | 2017-12-05 | 1 | -31/+29 |
* | | | | | | | | | | Merge branch 'en/remove-stripspace' | Junio C Hamano | 2017-12-13 | 1 | -9/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | strbuf: remove unused stripspace function aliasen/remove-stripspace | Elijah Newren | 2017-12-05 | 1 | -9/+0 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-12-13 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-status.txt: mention --no-optional-locksjk/no-optional-locks | Jeff King | 2017-11-27 | 1 | -0/+13 |
* | | | | | | | | | | | Merge branch 'ds/for-each-file-in-obj-micro-optim' | Junio C Hamano | 2017-12-13 | 2 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | sha1_file: use strbuf_add() instead of strbuf_addf()ds/for-each-file-in-obj-micro-optim | Derrick Stolee | 2017-12-04 | 2 | -5/+11 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/progress-delay-fix' | Junio C Hamano | 2017-12-13 | 1 | -19/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | progress: drop delay-threshold codejk/progress-delay-fix | Lars Schneider | 2017-12-04 | 1 | -19/+5 |
| * | | | | | | | | | | | progress: set default delay threshold to 100%, not 0% | Jeff King | 2017-12-04 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'ks/doc-checkout-previous' | Junio C Hamano | 2017-12-13 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Doc/checkout: checking out using @{-N} can lead to detached stateks/doc-checkout-previous | Kaartic Sivaraam | 2017-11-28 | 1 | -4/+4 |
* | | | | | | | | | | | | | Merge branch 'fk/sendmail-from-path' | Junio C Hamano | 2017-12-13 | 2 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-send-email: honor $PATH for sendmail binaryfk/sendmail-from-path | Florian Klink | 2017-11-28 | 2 | -4/+6 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'tg/t-readme-updates' | Junio C Hamano | 2017-12-13 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t/README: document test_cmp_revtg/t-readme-updates | Thomas Gummerer | 2017-11-27 | 1 | -0/+5 |
| * | | | | | | | | | | | | | t/README: remove mention of adding copyright notices | Thomas Gummerer | 2017-11-27 | 1 | -4/+1 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |