Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | submodule: submodule_move_head omits old argument in forced casesb/submodule-update-reset-fix | Stefan Beller | 2018-01-05 | 1 | -0/+14 |
* | t/lib-submodule-update.sh: fix test ignoring ignored files in submodules | Stefan Beller | 2018-01-05 | 1 | -0/+1 |
* | t/lib-submodule-update.sh: clarify test | Stefan Beller | 2018-01-05 | 1 | -2/+2 |
* | Merge branch 'sb/describe-blob' | Junio C Hamano | 2017-12-28 | 2 | -1/+112 |
|\ | |||||
| * | builtin/describe.c: describe a blob | Stefan Beller | 2017-12-19 | 1 | -0/+34 |
| * | revision.h: introduce blob/tree walking in order of the commits | Stefan Beller | 2017-11-16 | 1 | -0/+77 |
| * | t6120: fix typo in test name | Stefan Beller | 2017-11-03 | 1 | -1/+1 |
* | | Merge branch 'hi/merge-verify-sig-config' | Junio C Hamano | 2017-12-28 | 2 | -0/+126 |
|\ \ | |||||
| * | | t5573, t7612: clean up after unexpected success of 'pull' and 'merge'hi/merge-verify-sig-config | Junio C Hamano | 2017-12-19 | 2 | -8/+17 |
| * | | t: add tests for pull --verify-signatures | Hans Jerry Illikainen | 2017-12-12 | 1 | -0/+78 |
| * | | merge: add config option for verifySignatures | Hans Jerry Illikainen | 2017-12-12 | 1 | -0/+39 |
* | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-12-28 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | p7519: improve check for prerequisite WATCHMAN | René Scharfe | 2017-12-18 | 1 | -2/+1 |
* | | | | Merge branch 'tz/lib-git-svn-svnserve-tests' | Junio C Hamano | 2017-12-28 | 1 | -11/+13 |
|\ \ \ \ | |||||
| * | | | | t/lib-git-svn.sh: improve svnserve tests with parallel make testtz/lib-git-svn-svnserve-tests | Todd Zullinger | 2017-12-14 | 1 | -2/+4 |
| * | | | | t/lib-git-svn: cleanup inconsistent tab/space usage | Todd Zullinger | 2017-12-14 | 1 | -11/+11 |
* | | | | | Merge branch 'ew/svn-crlf' | Junio C Hamano | 2017-12-28 | 1 | -0/+27 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlf | Junio C Hamano | 2017-12-14 | 1 | -0/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-svn: convert CRLF to LF in commit message to SVN | Eric Wong | 2017-12-14 | 1 | -0/+27 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Merge branch 'cc/skip-to-optional-val' | Junio C Hamano | 2017-12-28 | 1 | -48/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t4045: reindent to make helpers readablecc/skip-to-optional-val | Junio C Hamano | 2017-12-11 | 1 | -48/+56 |
| * | | | | | | diff: add tests for --relative without optional prefix value | Jacob Keller | 2017-12-11 | 1 | -8/+14 |
* | | | | | | | Merge branch 'sb/test-helper-excludes' | Junio C Hamano | 2017-12-27 | 1 | -41/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/helper: ignore everything but sourcessb/test-helper-excludes | Stefan Beller | 2017-12-12 | 1 | -38/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'tz/redirect-fix' into maint | Junio C Hamano | 2017-12-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tz/notes-error-to-stderr' into maint | Junio C Hamano | 2017-12-06 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+36 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ew/rebase-mboxrd' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/avoid-rewriting-packed-refs' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+118 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/clone-shared-worktree' | Junio C Hamano | 2017-12-27 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | clone: support 'clone --shared' from a worktreees/clone-shared-worktree | Eric Sunshine | 2017-12-11 | 1 | -0/+6 |
* | | | | | | | | | | | | | | Merge branch 'jt/decorate-api' | Junio C Hamano | 2017-12-27 | 3 | -0/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | decorate: clean up and document APIjt/decorate-api | Jonathan Tan | 2017-12-08 | 3 | -0/+85 |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'es/worktree-checkout-hook' | Junio C Hamano | 2017-12-27 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | worktree: invoke post-checkout hook (unless --no-checkout)es/worktree-checkout-hook | Eric Sunshine | 2017-12-07 | 1 | -0/+29 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'lb/rebase-i-short-command-names' | Junio C Hamano | 2017-12-27 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t3404: add test case for abbreviated commands | Liam Beguin | 2017-12-05 | 1 | -0/+22 |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'tb/check-crlf-for-safe-crlf' | Junio C Hamano | 2017-12-27 | 1 | -5/+72 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t0027: Adapt the new MIX tests to Windowstb/check-crlf-for-safe-crlf | Torsten Bögershausen | 2017-12-08 | 1 | -8/+9 |
| * | | | | | | | | | | | | | | convert: tighten the safe autocrlf handling | Torsten Bögershausen | 2017-11-27 | 1 | -5/+71 |
* | | | | | | | | | | | | | | | Merge branch 'jh/object-filtering' | Junio C Hamano | 2017-12-27 | 2 | -0/+600 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | pack-objects: add list-objects filtering | Jeff Hostetler | 2017-11-22 | 1 | -0/+375 |
| * | | | | | | | | | | | | | | | rev-list: add list-objects filtering support | Jeff Hostetler | 2017-11-22 | 1 | -0/+225 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'ar/unconfuse-three-dots' | Junio C Hamano | 2017-12-19 | 18 | -9/+401 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t2020: test variations that matterar/unconfuse-three-dots | Junio C Hamano | 2017-12-06 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | t4013: test new output from diff --abbrev --raw | Ann T Ropea | 2017-12-06 | 15 | -1/+253 |
| * | | | | | | | | | | | | | | | t4013: prepare for upcoming "diff --raw --abbrev" output format change | Ann T Ropea | 2017-12-06 | 1 | -6/+23 |
| * | | | | | | | | | | | | | | | checkout: describe_detached_head: remove ellipsis after committish | Ann T Ropea | 2017-12-06 | 1 | -0/+123 |
| * | | | | | | | | | | | | | | | print_sha1_ellipsis: introduce helper | Ann T Ropea | 2017-12-04 | 3 | -3/+3 |