summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: support anchoring line(s)jt/diff-anchored-patienceJonathan Tan2017-11-286-7/+169
* RelNotes: the sixth batch for 2.16Junio C Hamano2017-11-271-8/+65
* Sync with maintJunio C Hamano2017-11-271-3/+8
|\
| * 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
| |\
| * \ Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano2017-11-273-19/+29
| |\ \
| * \ \ Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano2017-11-271-39/+20
| |\ \ \
| * \ \ \ Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano2017-11-271-8/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano2017-11-271-2/+13
| |\ \ \ \ \
| * | | | | | RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3
* | | | | | | Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano2017-11-271-0/+12
|\ \ \ \ \ \ \
| * | | | | | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthruShuyu Wei2017-11-211-0/+12
* | | | | | | | Merge branch 'ks/rebase-no-git-foo'Junio C Hamano2017-11-271-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | git-rebase: clean up dashed-usages in messagesks/rebase-no-git-fooKaartic Sivaraam2017-11-211-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/config-write-section-fix'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config: flip return value of write_section()rs/config-write-section-fixRené Scharfe2017-11-181-1/+1
* | | | | | | | | Merge branch 'ew/rebase-mboxrd'Junio C Hamano2017-11-272-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrdEric Wong2017-11-182-0/+24
* | | | | | | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-277-18/+102
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-177-18/+102
* | | | | | | | | | | Merge branch 'tz/complete-branch-copy'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copyTodd Zullinger2017-11-171-1/+1
* | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-272-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-172-0/+16
* | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index'Junio C Hamano2017-11-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-indexPhillip Wood2017-11-161-1/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-11-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copyPhillip Wood2017-11-161-2/+2
* | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano2017-11-272-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 'tz/notes-error-to-stderr'Junio C Hamano2017-11-273-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-153-9/+9
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tz/redirect-fix'Junio C Hamano2017-11-272-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 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-272-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: add git config sendemail.tocmdrv/sendemail-tocmd-in-config-and-completionRasmus Villemoes2017-11-141-0/+1
| * | | | | | | | | | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema...Rasmus Villemoes2017-11-141-0/+1
* | | | | | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc'Junio C Hamano2017-11-271-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 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-278-18/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-088-6/+78
| * | | | | | | | | | | | | | | | xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-272-13/+15
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2017-11-211-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Almost ready for 2.15.1Junio C Hamano2017-11-211-0/+12
| * | | | | | | | | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-211-29/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-212-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-2144-103/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \