summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wipjch-dontuse/reset-hard-pathspecJunio C Hamano2017-12-152-6/+8
* Merge branch 'ew/svn-crlf' into jchJunio C Hamano2017-12-142-0/+28
|\
| * Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlfJunio C Hamano2017-12-142-0/+28
| |\
| | * git-svn: convert CRLF to LF in commit message to SVNEric Wong2017-12-142-0/+28
* | | Merge branch 'tz/lib-git-svn-svnserve-tests' into jchJunio C Hamano2017-12-141-11/+13
|\ \ \
| * | | t/lib-git-svn.sh: improve svnserve tests with parallel make testtz/lib-git-svn-svnserve-testsTodd Zullinger2017-12-141-2/+4
| * | | t/lib-git-svn: cleanup inconsistent tab/space usageTodd Zullinger2017-12-141-11/+11
* | | | Merge branch 'ks/rebase-error-messages' into jchJunio C Hamano2017-12-141-9/+24
|\ \ \ \
| * | | | rebase: rebasing can also be done when HEAD is detachedKaartic Sivaraam2017-12-141-2/+14
| * | | | rebase: distinguish user input by quoting itKaartic Sivaraam2017-12-141-2/+2
| * | | | rebase: consistently use branch_name variableKaartic Sivaraam2017-12-141-6/+9
* | | | | Merge branch 'bw/path-doc' into jchJunio C Hamano2017-12-141-21/+112
|\ \ \ \ \
| * | | | | path: document path functionsbw/path-docBrandon Williams2017-12-131-21/+112
| | |/ / / | |/| | |
* | | | | Merge branch 'cc/skip-to-optional-val' into jchJunio C Hamano2017-12-145-90/+126
|\ \ \ \ \
| * | | | | t4045: reindent to make helpers readablecc/skip-to-optional-valJunio C Hamano2017-12-111-48/+56
| * | | | | diff: add tests for --relative without optional prefix valueJacob Keller2017-12-111-8/+14
| * | | | | diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano2017-12-111-4/+3
| * | | | | diff: use skip_to_optional_arg_default()Christian Couder2017-12-111-16/+4
| * | | | | diff: use skip_to_optional_arg()Christian Couder2017-12-111-14/+9
| * | | | | index-pack: use skip_to_optional_arg()Christian Couder2017-12-111-8/+3
| * | | | | git-compat-util: introduce skip_to_optional_arg()Christian Couder2017-12-112-0/+45
* | | | | | Merge branch 'jh/partial-clone-doc' into jchJunio C Hamano2017-12-141-0/+324
|\ \ \ \ \ \
| * | | | | | partial-clone: design docjh/partial-clone-docJeff Hostetler2017-12-141-0/+324
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/test-suite-tracing' into jchJunio C Hamano2017-12-144-18/+48
|\ \ \ \ \ \
| * | | | | | t/Makefile: introduce TEST_SHELL_PATHjk/test-suite-tracingJeff King2017-12-083-3/+13
| * | | | | | test-lib: make "-x" work with "--verbose-log"Jeff King2017-12-081-2/+8
| * | | | | | t5615: avoid re-using descriptor 4Jeff King2017-12-081-3/+3
| * | | | | | test-lib: silence "-x" cleanup under bashJeff King2017-12-081-10/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ra/prompt-eread-fix' into jchJunio C Hamano2017-12-141-3/+4
|\ \ \ \ \ \
| * | | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fixRobert Abel2017-12-061-1/+1
| * | | | | | git-prompt: make __git_eread intended use explicitRobert Abel2017-12-061-3/+4
* | | | | | | Merge branch 'ot/mru-on-list' into jchJunio C Hamano2017-12-144-59/+33
|\ \ \ \ \ \ \
| * | | | | | | mru: use double-linked list from list.hot/mru-on-listOlga Telezhnaya2017-10-014-59/+33
* | | | | | | | Merge branch 'sb/describe-blob' into jchJunio C Hamano2017-12-148-52/+277
|\ \ \ \ \ \ \ \
| * | | | | | | | SQUASH???Junio C Hamano2017-12-081-1/+1
| * | | | | | | | builtin/describe.c: describe a blobStefan Beller2017-11-163-7/+107
| * | | | | | | | builtin/describe.c: factor out describe_commitStefan Beller2017-11-161-26/+37
| * | | | | | | | builtin/describe.c: print debug statements earlierStefan Beller2017-11-161-1/+4
| * | | | | | | | builtin/describe.c: rename `oid` to avoid variable shadowingStefan Beller2017-11-161-4/+4
| * | | | | | | | revision.h: introduce blob/tree walking in order of the commitsStefan Beller2017-11-165-1/+94
| * | | | | | | | list-objects.c: factor out traverse_trees_and_blobsStefan Beller2017-11-031-19/+31
| * | | | | | | | t6120: fix typo in test nameStefan Beller2017-11-031-1/+1
* | | | | | | | | ### match nextJunio C Hamano2017-12-140-0/+0
* | | | | | | | | Merge branch 'rb/quick-install-doc' into jchJunio C Hamano2017-12-142-6/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | install-doc-quick: allow specifying what ref to installrb/quick-install-docRandall S. Becker2017-12-122-6/+8
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jt/transport-no-more-rsync' into jchJunio C Hamano2017-12-142-9/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | transport: remove unused "push" in vtablejt/transport-no-more-rsyncJonathan Tan2017-12-122-9/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sg/travis-fixes' into jchJunio C Hamano2017-12-143-29/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing outputSZEDER Gábor2017-12-121-1/+1
| * | | | | | | | | travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'SZEDER Gábor2017-12-122-2/+2