summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-281-33/+35
* Start preparing for 2.10.1Junio C Hamano2016-09-192-1/+34
* Merge branch 'sb/diff-cleanup' into maintJunio C Hamano2016-09-191-21/+10
|\
| * diff: remove dead codeStefan Beller2016-09-081-8/+0
| * diff: omit found pointer from emit_callbackStefan Beller2016-09-081-4/+2
| * diff.c: use diff_options directlyStefan Beller2016-09-081-11/+10
* | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-195-7/+7
|\ \
| * | unpack-trees: do not capitalize "working"Alex Henrie2016-09-081-2/+2
| * | git-merge-octopus: do not capitalize "octopus"Alex Henrie2016-09-081-2/+2
| * | git-rebase--interactive: fix English grammarAlex Henrie2016-09-081-1/+1
| * | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-081-1/+1
| * | am: put spaces around pipe in usage stringAlex Henrie2016-09-081-1/+1
| |/
* | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano2016-09-191-1/+1
|\ \
| * | transport: report missing submodule pushes consistently on stderrStefan Beller2016-09-081-1/+1
| |/
* | Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano2016-09-191-9/+0
|\ \
| * | xdiff: remove unneeded declarationsStefan Beller2016-09-071-9/+0
* | | Merge branch 'js/t9903-chaining' into maintJunio C Hamano2016-09-191-1/+1
|\ \ \
| * | | t9903: fix broken && chainJohannes Sixt2016-09-071-1/+1
| |/ /
* | | Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-196-78/+21
|\ \ \
| * | | introduce hex2chr() for converting two hexadecimal digits to a characterRené Scharfe2016-09-076-78/+21
| |/ /
* | | Merge branch 'rs/compat-strdup' into maintJunio C Hamano2016-09-194-19/+33
|\ \ \
| * | | compat: move strdup(3) replacement to its own fileRené Scharfe2016-09-074-19/+33
| |/ /
* | | Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maintJunio C Hamano2016-09-193-1/+3
|\ \ \
| * | | color_parse_mem: initialize "struct color" temporaryJeff King2016-08-311-1/+1
| * | | error_errno: use constant return similar to error()Jeff King2016-08-312-0/+2
| |/ /
* | | Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-194-9/+19
|\ \ \
| * | | t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-3/+12
| * | | t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-5/+5
| * | | test-lib.sh: preserve GIT_TRACE_CURL from the environmentElia Pinto2016-09-071-0/+1
| * | | t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-1/+1
| | |/ | |/|
* | | Merge branch 'js/t6026-clean-up' into maintJunio C Hamano2016-09-191-0/+2
|\ \ \
| * | | t6026-merge-attr: clean up background process at end of test caseJohannes Sixt2016-09-071-0/+2
| |/ /
* | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-192-7/+16
|\ \ \
| * | | symbolic-ref -d: do not allow removal of HEADJunio C Hamano2016-09-022-7/+16
| | |/ | |/|
* | | Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2016-09-192-0/+36
|\ \ \
| * | | submodule: avoid auto-discovery in prepare_submodule_repo_env()Junio C Hamano2016-09-012-0/+36
| |/ /
* | | Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-191-2/+2
|\ \ \
| * | | test-lib: drop PID from test-results/*.countJeff King2016-08-301-2/+2
| |/ /
* | | Merge branch 'bh/diff-highlight-graph' into maintJunio C Hamano2016-09-195-6/+338
|\ \ \
| * | | diff-highlight: avoid highlighting combined diffsJeff King2016-08-312-1/+38
| * | | diff-highlight: add multi-byte testsJeff King2016-08-311-1/+35
| * | | diff-highlight: ignore test cruftJeff King2016-08-311-0/+2
| * | | diff-highlight: add support for --graph outputBrian Henderson2016-08-292-7/+14
| * | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-291-0/+62
| * | | diff-highlight: add some testsBrian Henderson2016-08-293-0/+190
* | | | Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-195-51/+88
|\ \ \ \
| * | | | doc: revisions: sort examples and fix alignment of the unchangedPhilip Oakley2016-08-141-6/+6
| * | | | doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-141-6/+17
| * | | | doc: revisions - clarify reachability examplesPhilip Oakley2016-08-141-5/+6
| * | | | doc: revisions - define `reachable`Philip Oakley2016-08-141-4/+10