Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t5615: avoid re-using descriptor 4 | Jeff King | 2017-12-08 | 1 | -3/+3 |
* | test-lib: silence "-x" cleanup under bash | Jeff King | 2017-12-08 | 1 | -10/+24 |
* | Prepare for 2.15.2 | Junio C Hamano | 2017-12-06 | 2 | -1/+48 |
* | Merge branch 'jc/merge-base-fork-point-doc' into maint | Junio C Hamano | 2017-12-06 | 1 | -8/+56 |
|\ | |||||
| * | merge-base --fork-point doc: clarify the example and failure modes | Junio C Hamano | 2017-11-09 | 1 | -8/+56 |
* | | Merge branch 'tz/redirect-fix' into maint | Junio C Hamano | 2017-12-06 | 2 | -2/+2 |
|\ \ | |||||
| * | | rebase: fix stderr redirect in apply_autostash() | Todd Zullinger | 2017-11-14 | 1 | -1/+1 |
| * | | t/lib-gpg: fix gpgconf stderr redirect to /dev/null | Todd Zullinger | 2017-11-14 | 1 | -1/+1 |
* | | | Merge branch 'tz/notes-error-to-stderr' into maint | Junio C Hamano | 2017-12-06 | 3 | -9/+9 |
|\ \ \ | |||||
| * | | | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 2017-11-15 | 3 | -9/+9 |
| | |/ | |/| | |||||
* | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint | Junio C Hamano | 2017-12-06 | 2 | -2/+39 |
|\ \ \ | |||||
| * | | | merge-recursive: handle addition of submodule on our side of history | Elijah Newren | 2017-11-15 | 2 | -3/+4 |
| * | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 | 1 | -0/+36 |
* | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint | Junio C Hamano | 2017-12-06 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | sequencer: reschedule pick if index can't be locked | Phillip Wood | 2017-11-16 | 1 | -1/+2 |
* | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint | Junio C Hamano | 2017-12-06 | 2 | -0/+16 |
|\ \ \ \ \ | |||||
| * | | | | | apply: update line lengths for --inaccurate-eof | René Scharfe | 2017-11-17 | 2 | -0/+16 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'tz/complete-branch-copy' into maint | Junio C Hamano | 2017-12-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | completion: add '--copy' option to 'git branch' | Todd Zullinger | 2017-11-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'ew/rebase-mboxrd' into maint | Junio C Hamano | 2017-12-06 | 2 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase: use mboxrd format to avoid split errors | Eric Wong | 2017-11-18 | 2 | -0/+24 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sd/branch-copy' into maint | Junio C Hamano | 2017-12-06 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: avoid "write_in_full(fd, buf, len) != len" pattern | Phillip Wood | 2017-11-16 | 1 | -2/+2 |
* | | | | | | | Merge branch 'sw/pull-ipv46-passthru' into maint | Junio C Hamano | 2017-12-06 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pull: pass -4/-6 option to 'git fetch' | Shuyu Wei | 2017-11-21 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' into maint | Junio C Hamano | 2017-12-06 | 3 | -161/+192 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: convert SubmittingPatches to AsciiDoc | brian m. carlson | 2017-11-13 | 3 | -161/+191 |
| * | | | | | | | | Documentation: enable compat-mode for Asciidoctor | brian m. carlson | 2017-10-30 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'mh/avoid-rewriting-packed-refs' into maint | Junio C Hamano | 2017-12-06 | 4 | -1/+238 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | files-backend: don't rewrite the `packed-refs` file unnecessarily | Michael Haggerty | 2017-10-30 | 4 | -3/+122 |
| * | | | | | | | | | t1409: check that `packed-refs` is not rewritten unnecessarily | Michael Haggerty | 2017-10-27 | 1 | -0/+118 |
* | | | | | | | | | | Git 2.15.1v2.15.1 | Junio C Hamano | 2017-11-28 | 1 | -0/+3 |
* | | | | | | | | | | Merge branch 'rs/config-write-section-fix' into maint | Junio C Hamano | 2017-11-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | config: flip return value of write_section() | René Scharfe | 2017-11-18 | 1 | -1/+1 |
* | | | | | | | | | | | A bit more fixes for 2.15.1 | Junio C Hamano | 2017-11-27 | 1 | -0/+5 |
* | | | | | | | | | | | Merge branch 'ma/reduce-heads-leakfix' into maint | Junio C Hamano | 2017-11-27 | 7 | -23/+52 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | reduce_heads: fix memory leaks | Martin Ågren | 2017-11-08 | 7 | -6/+35 |
| * | | | | | | | | | | | builtin/merge-base: free commit lists | Martin Ågren | 2017-11-08 | 1 | -18/+18 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ma/bisect-leakfix' into maint | Junio C Hamano | 2017-11-27 | 3 | -19/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | bisect: fix memory leak when returning best element | Martin Ågren | 2017-11-06 | 1 | -1/+5 |
| * | | | | | | | | | | | bisect: fix off-by-one error in `best_bisection_sorted()` | Martin Ågren | 2017-11-06 | 1 | -3/+4 |
| * | | | | | | | | | | | bisect: fix memory leak in `find_bisection()` | Martin Ågren | 2017-11-06 | 1 | -1/+3 |
| * | | | | | | | | | | | bisect: change calling-convention of `find_bisection()` | Martin Ågren | 2017-11-06 | 3 | -14/+17 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -39/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines() | René Scharfe | 2017-11-12 | 1 | -39/+20 |
* | | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' into maint | Junio C Hamano | 2017-11-27 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | doc/SubmittingPatches: correct subject guidance | Adam Dinwoodie | 2017-11-10 | 1 | -8/+13 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs/imap-send-next-arg-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | imap-send: handle missing response codes gracefully | René Scharfe | 2017-11-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | imap-send: handle NULL return of next_arg() | René Scharfe | 2017-11-03 | 1 | -1/+12 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |