aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-19
|\
| * unpack-trees: do not capitalize "working"Alex Henrie2016-09-08
| * git-merge-octopus: do not capitalize "octopus"Alex Henrie2016-09-08
| * git-rebase--interactive: fix English grammarAlex Henrie2016-09-08
| * cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-08
| * am: put spaces around pipe in usage stringAlex Henrie2016-09-08
* | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano2016-09-19
|\ \
| * | transport: report missing submodule pushes consistently on stderrStefan Beller2016-09-08
| |/
* | Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano2016-09-19
|\ \
| * | xdiff: remove unneeded declarationsStefan Beller2016-09-07
* | | Merge branch 'js/t9903-chaining' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | t9903: fix broken && chainJohannes Sixt2016-09-07
| |/ /
* | | Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | introduce hex2chr() for converting two hexadecimal digits to a characterRené Scharfe2016-09-07
| |/ /
* | | Merge branch 'rs/compat-strdup' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | compat: move strdup(3) replacement to its own fileRené Scharfe2016-09-07
| |/ /
* | | Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | color_parse_mem: initialize "struct color" temporaryJeff King2016-08-31
| * | | error_errno: use constant return similar to error()Jeff King2016-08-31
| |/ /
* | | Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-07
| * | | t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-07
| * | | test-lib.sh: preserve GIT_TRACE_CURL from the environmentElia Pinto2016-09-07
| * | | t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-07
| | |/ | |/|
* | | Merge branch 'js/t6026-clean-up' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | t6026-merge-attr: clean up background process at end of test caseJohannes Sixt2016-09-07
| |/ /
* | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | symbolic-ref -d: do not allow removal of HEADJunio C Hamano2016-09-02
| | |/ | |/|
* | | Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | submodule: avoid auto-discovery in prepare_submodule_repo_env()Junio C Hamano2016-09-01
| |/ /
* | | Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | test-lib: drop PID from test-results/*.countJeff King2016-08-30
| |/ /
* | | Merge branch 'bh/diff-highlight-graph' into maintJunio C Hamano2016-09-19
|\ \ \
| * | | diff-highlight: avoid highlighting combined diffsJeff King2016-08-31
| * | | diff-highlight: add multi-byte testsJeff King2016-08-31
| * | | diff-highlight: ignore test cruftJeff King2016-08-31
| * | | diff-highlight: add support for --graph outputBrian Henderson2016-08-29
| * | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-29
| * | | diff-highlight: add some testsBrian Henderson2016-08-29
* | | | Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-19
|\ \ \ \
| * | | | doc: revisions: sort examples and fix alignment of the unchangedPhilip Oakley2016-08-13
| * | | | doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-13
| * | | | doc: revisions - clarify reachability examplesPhilip Oakley2016-08-13
| * | | | doc: revisions - define `reachable`Philip Oakley2016-08-13
| * | | | doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-13
| * | | | doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-13
| * | | | doc: revisions: single vs multi-parent notation comparisonPhilip Oakley2016-08-13
| * | | | doc: revisions: extra clarification of <rev>^! notation effectsPhilip Oakley2016-08-13
| * | | | doc: revisions: give headings for the two and three dot notationsPhilip Oakley2016-08-12
| * | | | doc: show the actual left, right, and boundary marksPhilip Oakley2016-07-20