Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wipjch-dontuse/reset-hard-pathspec | Junio C Hamano | 2017-12-15 | 2 | -6/+8 |
* | Merge branch 'ew/svn-crlf' into jch | Junio C Hamano | 2017-12-14 | 2 | -0/+28 |
|\ | |||||
| * | Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlf | Junio C Hamano | 2017-12-14 | 2 | -0/+28 |
| |\ | |||||
| | * | git-svn: convert CRLF to LF in commit message to SVN | Eric Wong | 2017-12-14 | 2 | -0/+28 |
* | | | Merge branch 'tz/lib-git-svn-svnserve-tests' into jch | Junio C Hamano | 2017-12-14 | 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 'ks/rebase-error-messages' into jch | Junio C Hamano | 2017-12-14 | 1 | -9/+24 |
|\ \ \ \ | |||||
| * | | | | rebase: rebasing can also be done when HEAD is detached | Kaartic Sivaraam | 2017-12-14 | 1 | -2/+14 |
| * | | | | rebase: distinguish user input by quoting it | Kaartic Sivaraam | 2017-12-14 | 1 | -2/+2 |
| * | | | | rebase: consistently use branch_name variable | Kaartic Sivaraam | 2017-12-14 | 1 | -6/+9 |
* | | | | | Merge branch 'bw/path-doc' into jch | Junio C Hamano | 2017-12-14 | 1 | -21/+112 |
|\ \ \ \ \ | |||||
| * | | | | | path: document path functionsbw/path-doc | Brandon Williams | 2017-12-13 | 1 | -21/+112 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'cc/skip-to-optional-val' into jch | Junio C Hamano | 2017-12-14 | 5 | -90/+126 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| * | | | | | diff: use skip_to_optional_arg_default() in parsing --relative | Junio C Hamano | 2017-12-11 | 1 | -4/+3 |
| * | | | | | diff: use skip_to_optional_arg_default() | Christian Couder | 2017-12-11 | 1 | -16/+4 |
| * | | | | | diff: use skip_to_optional_arg() | Christian Couder | 2017-12-11 | 1 | -14/+9 |
| * | | | | | index-pack: use skip_to_optional_arg() | Christian Couder | 2017-12-11 | 1 | -8/+3 |
| * | | | | | git-compat-util: introduce skip_to_optional_arg() | Christian Couder | 2017-12-11 | 2 | -0/+45 |
* | | | | | | Merge branch 'jh/partial-clone-doc' into jch | Junio C Hamano | 2017-12-14 | 1 | -0/+324 |
|\ \ \ \ \ \ | |||||
| * | | | | | | partial-clone: design docjh/partial-clone-doc | Jeff Hostetler | 2017-12-14 | 1 | -0/+324 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jk/test-suite-tracing' into jch | Junio C Hamano | 2017-12-14 | 4 | -18/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/Makefile: introduce TEST_SHELL_PATHjk/test-suite-tracing | Jeff King | 2017-12-08 | 3 | -3/+13 |
| * | | | | | | 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 'ra/prompt-eread-fix' into jch | Junio C Hamano | 2017-12-14 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fix | Robert Abel | 2017-12-06 | 1 | -1/+1 |
| * | | | | | | git-prompt: make __git_eread intended use explicit | Robert Abel | 2017-12-06 | 1 | -3/+4 |
* | | | | | | | Merge branch 'ot/mru-on-list' into jch | Junio C Hamano | 2017-12-14 | 4 | -59/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mru: use double-linked list from list.hot/mru-on-list | Olga Telezhnaya | 2017-10-01 | 4 | -59/+33 |
* | | | | | | | | Merge branch 'sb/describe-blob' into jch | Junio C Hamano | 2017-12-14 | 8 | -52/+277 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SQUASH??? | Junio C Hamano | 2017-12-08 | 1 | -1/+1 |
| * | | | | | | | | builtin/describe.c: describe a blob | Stefan Beller | 2017-11-16 | 3 | -7/+107 |
| * | | | | | | | | builtin/describe.c: factor out describe_commit | Stefan Beller | 2017-11-16 | 1 | -26/+37 |
| * | | | | | | | | builtin/describe.c: print debug statements earlier | Stefan Beller | 2017-11-16 | 1 | -1/+4 |
| * | | | | | | | | builtin/describe.c: rename `oid` to avoid variable shadowing | Stefan Beller | 2017-11-16 | 1 | -4/+4 |
| * | | | | | | | | revision.h: introduce blob/tree walking in order of the commits | Stefan Beller | 2017-11-16 | 5 | -1/+94 |
| * | | | | | | | | list-objects.c: factor out traverse_trees_and_blobs | Stefan Beller | 2017-11-03 | 1 | -19/+31 |
| * | | | | | | | | t6120: fix typo in test name | Stefan Beller | 2017-11-03 | 1 | -1/+1 |
* | | | | | | | | | ### match next | Junio C Hamano | 2017-12-14 | 0 | -0/+0 |
* | | | | | | | | | Merge branch 'rb/quick-install-doc' into jch | Junio C Hamano | 2017-12-14 | 2 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | install-doc-quick: allow specifying what ref to installrb/quick-install-doc | Randall S. Becker | 2017-12-12 | 2 | -6/+8 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jt/transport-no-more-rsync' into jch | Junio C Hamano | 2017-12-14 | 2 | -9/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | transport: remove unused "push" in vtablejt/transport-no-more-rsync | Jonathan Tan | 2017-12-12 | 2 | -9/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'sg/travis-fixes' into jch | Junio C Hamano | 2017-12-14 | 3 | -29/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output | SZEDER Gábor | 2017-12-12 | 1 | -1/+1 |
| * | | | | | | | | | travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh' | SZEDER Gábor | 2017-12-12 | 2 | -2/+2 |