aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* t/Makefile: introduce TEST_SHELL_PATHJeff King2017-12-08
* test-lib: make "-x" work with "--verbose-log"Jeff King2017-12-08
* t5615: avoid re-using descriptor 4Jeff King2017-12-08
* test-lib: silence "-x" cleanup under bashJeff King2017-12-08
* Prepare for 2.15.2Junio C Hamano2017-12-06
* Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano2017-12-06
|\
| * merge-base --fork-point doc: clarify the example and failure modesJunio C Hamano2017-11-09
* | Merge branch 'tz/redirect-fix' into maintJunio C Hamano2017-12-06
|\ \
| * | rebase: fix stderr redirect in apply_autostash()Todd Zullinger2017-11-14
| * | t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger2017-11-14
* | | Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-06
|\ \ \
| * | | notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger2017-11-15
| | |/ | |/|
* | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2017-12-06
|\ \ \
| * | | merge-recursive: handle addition of submodule on our side of historyElijah Newren2017-11-15
| * | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-12
* | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano2017-12-06
|\ \ \ \
| * | | | sequencer: reschedule pick if index can't be lockedPhillip Wood2017-11-16
* | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-06
|\ \ \ \ \
| * | | | | apply: update line lengths for --inaccurate-eofRené Scharfe2017-11-17
| | |_|/ / | |/| | |
* | | | | Merge branch 'tz/complete-branch-copy' into maintJunio C Hamano2017-12-06
|\ \ \ \ \
| * | | | | completion: add '--copy' option to 'git branch'Todd Zullinger2017-11-17
* | | | | | Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2017-12-06
|\ \ \ \ \ \
| * | | | | | rebase: use mboxrd format to avoid split errorsEric Wong2017-11-18
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sd/branch-copy' into maintJunio C Hamano2017-12-06
|\ \ \ \ \ \
| * | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternPhillip Wood2017-11-16
* | | | | | | Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano2017-12-06
|\ \ \ \ \ \ \
| * | | | | | | pull: pass -4/-6 option to 'git fetch'Shuyu Wei2017-11-21
* | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' into maintJunio C Hamano2017-12-06
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: convert SubmittingPatches to AsciiDocbrian m. carlson2017-11-13
| * | | | | | | | Documentation: enable compat-mode for Asciidoctorbrian m. carlson2017-10-30
* | | | | | | | | Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano2017-12-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | files-backend: don't rewrite the `packed-refs` file unnecessarilyMichael Haggerty2017-10-30
| * | | | | | | | | t1409: check that `packed-refs` is not rewritten unnecessarilyMichael Haggerty2017-10-27
* | | | | | | | | | Git 2.15.1Junio C Hamano2017-11-28
* | | | | | | | | | Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano2017-11-28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: flip return value of write_section()René Scharfe2017-11-18
* | | | | | | | | | | A bit more fixes for 2.15.1Junio C Hamano2017-11-27
* | | | | | | | | | | Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reduce_heads: fix memory leaksMartin Ågren2017-11-08
| * | | | | | | | | | | builtin/merge-base: free commit listsMartin Ågren2017-11-08
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bisect: fix memory leak when returning best elementMartin Ågren2017-11-06
| * | | | | | | | | | | bisect: fix off-by-one error in `best_bisection_sorted()`Martin Ågren2017-11-06
| * | | | | | | | | | | bisect: fix memory leak in `find_bisection()`Martin Ågren2017-11-06
| * | | | | | | | | | | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-06
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe2017-11-12
* | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc/SubmittingPatches: correct subject guidanceAdam Dinwoodie2017-11-11
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \