summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status: support --no-ahead-behind in long formatjh/status-no-ahead-behindJeff Hostetler2018-01-245-8/+46
* status: update short status to respect --no-ahead-behindJeff Hostetler2018-01-242-4/+20
* status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler2018-01-247-11/+102
* stat_tracking_info: return +1 when branches not equalJeff Hostetler2018-01-244-20/+36
* Git 2.16-rc0v2.16.0-rc0Junio C Hamano2017-12-282-1/+32
* Merge branch 'sb/describe-blob'Junio C Hamano2017-12-288-52/+277
|\
| * builtin/describe.c: describe a blobStefan Beller2017-12-193-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
* | Merge branch 'hi/merge-verify-sig-config'Junio C Hamano2017-12-284-0/+132
|\ \
| * | t5573, t7612: clean up after unexpected success of 'pull' and 'merge'hi/merge-verify-sig-configJunio C Hamano2017-12-192-8/+17
| * | t: add tests for pull --verify-signaturesHans Jerry Illikainen2017-12-121-0/+78
| * | merge: add config option for verifySignaturesHans Jerry Illikainen2017-12-123-0/+45
* | | Merge branch 'ws/curl-http-proxy-over-https'Junio C Hamano2017-12-281-0/+5
|\ \ \
| * | | http: support CURLPROXY_HTTPSws/curl-http-proxy-over-httpsWei Shuyu2017-12-191-0/+5
* | | | 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