summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'ks/doc-previous-checkout'Junio C Hamano2017-12-281-7/+12
|\ \ \ \
| * | | | Doc/check-ref-format: clarify information about @{-N} syntaxks/doc-previous-checkoutKaartic Sivaraam2017-12-191-7/+12
* | | | | Merge branch 'ks/rebase-error-messages'Junio C Hamano2017-12-281-10/+25
|\ \ \ \ \
| * | | | | rebase: rebasing can also be done when HEAD is detachedks/rebase-error-messagesKaartic Sivaraam2017-12-191-2/+14
| * | | | | rebase: distinguish user input by quoting itKaartic Sivaraam2017-12-191-2/+2
| * | | | | rebase: consistently use branch_name variableKaartic Sivaraam2017-12-191-7/+10
| |/ / / /
* | | | | Merge branch 'sr/http-sslverify-config-doc'Junio C Hamano2017-12-281-2/+2
|\ \ \ \ \
| * | | | | config: document default value of http.sslVerifysr/http-sslverify-config-docSimon Ruderich2017-12-181-2/+2
* | | | | | Merge branch 'nm/imap-send-quote-server-folder-name'Junio C Hamano2017-12-281-1/+7
|\ \ \ \ \ \
| * | | | | | imap-send: URI encode server foldernm/imap-send-quote-server-folder-nameNicolas Morey-Chaisemartin2017-12-181-1/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-12-281-2/+1
|\ \ \ \ \ \
| * | | | | | p7519: improve check for prerequisite WATCHMANRené Scharfe2017-12-181-2/+1
* | | | | | | Merge branch 'jh/partial-clone-doc'Junio C Hamano2017-12-281-0/+324
|\ \ \ \ \ \ \
| * | | | | | | partial-clone: design docjh/partial-clone-docJeff Hostetler2017-12-141-0/+324
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jt/transport-hide-vtable'Junio C Hamano2017-12-286-93/+120
|\ \ \ \ \ \ \
| * | | | | | | transport: make transport vtable more privatejt/transport-hide-vtableJonathan Tan2017-12-144-87/+120
| * | | | | | | clone, fetch: remove redundant transport checkJonathan Tan2017-12-142-6/+0
* | | | | | | | Merge branch 'js/enhanced-version-info'Junio C Hamano2017-12-284-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | version --build-options: report commit, too, if possiblejs/enhanced-version-infoJohannes Schindelin2017-12-144-1/+10
| * | | | | | | | version --build-options: also report host CPUEric Sunshine2017-12-142-0/+10
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'tz/lib-git-svn-svnserve-tests'Junio C Hamano2017-12-281-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 'ew/svn-crlf'Junio C Hamano2017-12-282-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 'cc/skip-to-optional-val'Junio C Hamano2017-12-285-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 'ra/prompt-eread-fix'Junio C Hamano2017-12-281-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 'bw/path-doc'Junio C Hamano2017-12-281-21/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | path: document path functionsbw/path-docBrandon Williams2017-12-131-21/+112
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | RelNotes: the eleventh batchJunio C Hamano2017-12-271-0/+41
* | | | | | | | | | | Merge branch 'rb/quick-install-doc'Junio C Hamano2017-12-272-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'Junio C Hamano2017-12-272-9/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | transport: remove unused "push" in vtablejt/transport-no-more-rsyncJonathan Tan2017-12-122-9/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sg/travis-fixes'Junio C Hamano2017-12-273-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
| * | | | | | | | | | travis-ci: move setting environment variables to 'ci/lib-travisci.sh'SZEDER Gábor2017-12-122-17/+22
| * | | | | | | | | | travis-ci: introduce a $jobname variable for 'ci/*' scriptsSZEDER Gábor2017-12-123-10/+15
* | | | | | | | | | | Merge branch 'sb/test-helper-excludes'Junio C Hamano2017-12-271-41/+5
|\ \ \ \ \ \ \ \ \ \ \