summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.16-rc1v2.16.0-rc1testJunio C Hamano2018-01-052-1/+12
* Merge branch 'js/sequencer-cleanups'Junio C Hamano2018-01-052-13/+20
|\
| * sequencer: do not invent whitespace when transforming OIDsjs/sequencer-cleanupsJohannes Schindelin2017-12-271-1/+4
| * sequencer: report when noop has an argumentJohannes Schindelin2017-12-271-4/+9
| * sequencer: remove superfluous conditionalJohannes Schindelin2017-12-271-3/+1
| * sequencer: strip bogus LF at end of error messagesJohannes Schindelin2017-12-271-4/+4
| * rebase: do not continue when the todo list generation failedJohannes Schindelin2017-12-271-1/+2
* | Merge branch 'jh/memihash-opt'Junio C Hamano2018-01-051-1/+1
|\ \
| * | t/helper/test-lazy-name-hash: fix compilationjh/memihash-optStefan Beller2017-12-221-1/+1
* | | Merge branch 'tb/test-lint-wc-l'Junio C Hamano2018-01-051-0/+1
|\ \ \
| * | | check-non-portable-shell.pl: `wc -l` may have leading WStb/test-lint-wc-lTorsten Bögershausen2017-12-221-0/+1
* | | | Merge branch 'rs/use-argv-array-in-child-process'Junio C Hamano2018-01-052-27/+12
|\ \ \ \
| * | | | send-pack: use internal argv_array of struct child_processrs/use-argv-array-in-child-processRené Scharfe2017-12-221-19/+9
| * | | | http: use internal argv_array of struct child_processRené Scharfe2017-12-221-8/+3
| |/ / /
* | | | Merge branch 'ld/p4-multiple-shelves'Junio C Hamano2018-01-053-26/+47
|\ \ \ \
| * | | | git-p4: update multiple shelved change listsld/p4-multiple-shelvesLuke Diamand2017-12-223-26/+47
| |/ / /
* | | | Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Junio C Hamano2018-01-051-1/+1
|\ \ \ \
| * | | | strbuf: fix urlencode format string on signed charjd/fix-strbuf-add-urlencode-bytesJulien Dusser2017-12-221-1/+1
* | | | | Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-055-42/+70
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-225-42/+70
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-222-1/+8
| | * | | | move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-223-37/+42
| | * | | | t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-221-5/+21
| | |/ / /
* | | | | Merge branch 'db/doc-config-section-names-with-bs'Junio C Hamano2018-01-051-5/+7
|\ \ \ \ \
| * | | | | config.txt: document behavior of backslashes in subsectionsdb/doc-config-section-names-with-bsDave Borowitz2017-12-221-5/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/test-suite-tracing'Junio C Hamano2018-01-054-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
| |/ / / /
* | | | | 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
View Lorry Controller Status