summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* describe: prepend "tags/" when describing tags with embedded namedk/describe-all-output-fixDaniel Knittl-Frank2017-12-272-3/+10
* Prepare for 2.15.2maint-2.15Junio C Hamano2017-12-062-1/+48
* Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano2017-12-061-8/+56
|\
| * merge-base --fork-point doc: clarify the example and failure modesjc/merge-base-fork-point-docJunio C Hamano2017-11-091-8/+56
* | Merge branch 'tz/redirect-fix' into maintJunio C Hamano2017-12-062-2/+2
|\ \
| * | rebase: fix stderr redirect in apply_autostash()tz/redirect-fixTodd Zullinger2017-11-141-1/+1
| * | t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger2017-11-141-1/+1
* | | Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano2017-12-063-9/+9
|\ \ \
| * | | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-153-9/+9
| | |/ | |/|
* | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2017-12-062-2/+39
|\ \ \
| * | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-152-3/+4
| * | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-121-0/+36
* | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano2017-12-061-1/+2
|\ \ \ \
| * | | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-indexPhillip Wood2017-11-161-1/+2
* | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2017-12-062-0/+16
|\ \ \ \ \
| * | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-172-0/+16
| | |_|/ / | |/| | |
* | | | | Merge branch 'tz/complete-branch-copy' into maintJunio C Hamano2017-12-061-1/+1
|\ \ \ \ \
| * | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copyTodd Zullinger2017-11-171-1/+1
* | | | | | Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2017-12-062-0/+24
|\ \ \ \ \ \
| * | | | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrdEric Wong2017-11-182-0/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'sd/branch-copy' into maintJunio C Hamano2017-12-061-2/+2
|\ \ \ \ \ \
| * | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copyPhillip Wood2017-11-161-2/+2
* | | | | | | Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano2017-12-061-0/+12
|\ \ \ \ \ \ \
| * | | | | | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthruShuyu Wei2017-11-211-0/+12
* | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' into maintJunio C Hamano2017-12-063-161/+192
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: convert SubmittingPatches to AsciiDocbrian m. carlson2017-11-133-161/+191
| * | | | | | | | Documentation: enable compat-mode for Asciidoctorbrian m. carlson2017-10-301-0/+1
* | | | | | | | | Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano2017-12-064-1/+238
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | files-backend: don't rewrite the `packed-refs` file unnecessarilymh/avoid-rewriting-packed-refsMichael Haggerty2017-10-304-3/+122
| * | | | | | | | | t1409: check that `packed-refs` is not rewritten unnecessarilyMichael Haggerty2017-10-271-0/+118
* | | | | | | | | | Git 2.15.1v2.15.1Junio C Hamano2017-11-281-0/+3
* | | | | | | | | | Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano2017-11-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: flip return value of write_section()rs/config-write-section-fixRené Scharfe2017-11-181-1/+1
* | | | | | | | | | | A bit more fixes for 2.15.1Junio C Hamano2017-11-271-0/+5
* | | | | | | | | | | Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano2017-11-277-23/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-087-6/+35
| * | | | | | | | | | | builtin/merge-base: free commit listsMartin Ågren2017-11-081-18/+18
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-273-19/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bisect: fix memory leak when returning best elementMartin Ågren2017-11-061-1/+5
| * | | | | | | | | | | bisect: fix off-by-one error in `best_bisection_sorted()`Martin Ågren2017-11-061-3/+4
| * | | | | | | | | | | bisect: fix memory leak in `find_bisection()`Martin Ågren2017-11-061-1/+3
| * | | | | | | | | | | bisect: change calling-convention of `find_bisection()`Martin Ågren2017-11-063-14/+17
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fixRené Scharfe2017-11-121-39/+20
* | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-271-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc/SubmittingPatches: correct subject guidancead/submitting-patches-title-decorationAdam Dinwoodie2017-11-111-8/+13
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-271-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | imap-send: handle missing response codes gracefullyrs/imap-send-next-arg-fixRené Scharfe2017-11-031-1/+1
| * | | | | | | | | | | | imap-send: handle NULL return of next_arg()René Scharfe2017-11-031-1/+12
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3