Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayjs/perl-path-workaround-in-tests | Johannes Schindelin | 2018-01-10 | 1 | -1/+16 |
* | Merge branch 'jh/memihash-opt' | Junio C Hamano | 2018-01-05 | 1 | -1/+1 |
|\ | |||||
| * | t/helper/test-lazy-name-hash: fix compilationjh/memihash-opt | Stefan Beller | 2017-12-22 | 1 | -1/+1 |
* | | Merge branch 'tb/test-lint-wc-l' | Junio C Hamano | 2018-01-05 | 1 | -0/+1 |
|\ \ | |||||
| * | | check-non-portable-shell.pl: `wc -l` may have leading WStb/test-lint-wc-l | Torsten Bögershausen | 2017-12-22 | 1 | -0/+1 |
* | | | Merge branch 'ld/p4-multiple-shelves' | Junio C Hamano | 2018-01-05 | 1 | -10/+14 |
|\ \ \ | |||||
| * | | | git-p4: update multiple shelved change listsld/p4-multiple-shelves | Luke Diamand | 2017-12-22 | 1 | -10/+14 |
| |/ / | |||||
* | | | Merge branch 'ew/empty-merge-with-dirty-index' | Junio C Hamano | 2018-01-05 | 1 | -5/+21 |
|\ \ \ | |||||
| * \ \ | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... | Junio C Hamano | 2017-12-22 | 1 | -5/+21 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | merge-recursive: avoid incorporating uncommitted changes in a merge | Elijah Newren | 2017-12-22 | 1 | -1/+1 |
| | * | | t6044: recursive can silently incorporate dirty changes in a merge | Elijah Newren | 2017-12-22 | 1 | -5/+21 |
* | | | | Merge branch 'jk/test-suite-tracing' | Junio C Hamano | 2018-01-05 | 3 | -18/+40 |
|\ \ \ \ | |||||
| * | | | | t/Makefile: introduce TEST_SHELL_PATHjk/test-suite-tracing | Jeff King | 2017-12-08 | 2 | -3/+5 |
| * | | | | test-lib: make "-x" work with "--verbose-log" | Jeff King | 2017-12-08 | 1 | -2/+8 |
| * | | | | t5615: avoid re-using descriptor 4 | Jeff King | 2017-12-08 | 1 | -3/+3 |
| * | | | | test-lib: silence "-x" cleanup under bash | Jeff King | 2017-12-08 | 1 | -10/+24 |
| | |/ / | |/| | | |||||
* | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |