Commit message (Expand) | Author | Age | |
---|---|---|---|
* | RelNotes: the sixth batch for 2.16 | Junio C Hamano | 2017-11-27 |
* | Sync with maint | Junio C Hamano | 2017-11-27 |
|\ | |||
| * | A bit more fixes for 2.15.1 | Junio C Hamano | 2017-11-27 |
| * | Merge branch 'ma/reduce-heads-leakfix' into maint | Junio C Hamano | 2017-11-27 |
| |\ | |||
| * \ | Merge branch 'ma/bisect-leakfix' into maint | Junio C Hamano | 2017-11-27 |
| |\ \ | |||
| * \ \ | Merge branch 'rs/apply-fuzzy-match-fix' into maint | Junio C Hamano | 2017-11-27 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'ad/submitting-patches-title-decoration' into maint | Junio C Hamano | 2017-11-27 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'rs/imap-send-next-arg-fix' into maint | Junio C Hamano | 2017-11-27 |
| |\ \ \ \ \ | |||
| * | | | | | | RelNotes: minor typo fixes in 2.15.1 draft | Todd Zullinger | 2017-11-26 |
* | | | | | | | Merge branch 'sw/pull-ipv46-passthru' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | pull: pass -4/-6 option to 'git fetch' | Shuyu Wei | 2017-11-21 |
* | | | | | | | | Merge branch 'ks/rebase-no-git-foo' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-rebase: clean up dashed-usages in messages | Kaartic Sivaraam | 2017-11-21 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/config-write-section-fix' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | config: flip return value of write_section() | René Scharfe | 2017-11-18 |
* | | | | | | | | | Merge branch 'ew/rebase-mboxrd' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rebase: use mboxrd format to avoid split errors | Eric Wong | 2017-11-18 |
* | | | | | | | | | | Merge branch 'tb/add-renormalize' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | add: introduce "--renormalize" | Torsten Bögershausen | 2017-11-17 |
* | | | | | | | | | | | Merge branch 'tz/complete-branch-copy' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | completion: add '--copy' option to 'git branch' | Todd Zullinger | 2017-11-17 |
* | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | apply: update line lengths for --inaccurate-eof | René Scharfe | 2017-11-17 |
* | | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | sequencer: reschedule pick if index can't be locked | Phillip Wood | 2017-11-16 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" pattern | Phillip Wood | 2017-11-16 |
* | | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | merge-recursive: handle addition of submodule on our side of history | Elijah Newren | 2017-11-15 |
| * | | | | | | | | | | | | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'tz/notes-error-to-stderr' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 2017-11-15 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | rebase: fix stderr redirect in apply_autostash() | Todd Zullinger | 2017-11-14 |
| * | | | | | | | | | | | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/null | Todd Zullinger | 2017-11-14 |
* | | | | | | | | | | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | completion: add git config sendemail.tocmd | Rasmus Villemoes | 2017-11-14 |
| * | | | | | | | | | | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema... | Rasmus Villemoes | 2017-11-14 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | merge-base --fork-point doc: clarify the example and failure modes | Junio C Hamano | 2017-11-09 |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 |
| * | | | | | | | | | | | | | | | | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | Almost ready for 2.15.1 | Junio C Hamano | 2017-11-21 |
| * | | | | | | | | | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/t4201-robustify' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tz/fsf-address-update' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ad/rebase-i-serie-typofix' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/info-alternates-fix' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |