Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtin/branch: strip refs/heads/ using skip_prefixks/branch-cleanup | Kaartic Sivaraam | 2017-12-07 | 1 | -4/+11 |
* | branch: update warning message shown when copying a misnamed branch | Kaartic Sivaraam | 2017-12-07 | 1 | -1/+1 |
* | branch: group related arguments of create_branch() | Kaartic Sivaraam | 2017-12-07 | 4 | -7/+8 |
* | branch: improve documentation and naming of create_branch() parameters | Kaartic Sivaraam | 2017-12-07 | 2 | -3/+8 |
* | RelNotes: the sixth batch for 2.16 | Junio C Hamano | 2017-11-27 | 1 | -8/+65 |
* | Sync with maint | Junio C Hamano | 2017-11-27 | 1 | -3/+8 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * \ | Merge branch 'ma/bisect-leakfix' into maint | Junio C Hamano | 2017-11-27 | 3 | -19/+29 |
| |\ \ | |||||
| * \ \ | Merge branch 'rs/apply-fuzzy-match-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -39/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ad/submitting-patches-title-decoration' into maint | Junio C Hamano | 2017-11-27 | 1 | -8/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs/imap-send-next-arg-fix' into maint | Junio C Hamano | 2017-11-27 | 1 | -2/+13 |
| |\ \ \ \ \ | |||||
| * | | | | | | RelNotes: minor typo fixes in 2.15.1 draft | Todd Zullinger | 2017-11-26 | 1 | -3/+3 |
* | | | | | | | Merge branch 'sw/pull-ipv46-passthru' | Junio C Hamano | 2017-11-27 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthru | Shuyu Wei | 2017-11-21 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'ks/rebase-no-git-foo' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-rebase: clean up dashed-usages in messagesks/rebase-no-git-foo | Kaartic Sivaraam | 2017-11-21 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rs/config-write-section-fix' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: flip return value of write_section()rs/config-write-section-fix | René Scharfe | 2017-11-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'ew/rebase-mboxrd' | Junio C Hamano | 2017-11-27 | 2 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrd | Eric Wong | 2017-11-18 | 2 | -0/+24 |
* | | | | | | | | | | Merge branch 'tb/add-renormalize' | Junio C Hamano | 2017-11-27 | 7 | -18/+102 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add: introduce "--renormalize"tb/add-renormalize | Torsten Bögershausen | 2017-11-17 | 7 | -18/+102 |
* | | | | | | | | | | | Merge branch 'tz/complete-branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copy | Todd Zullinger | 2017-11-17 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-line | René Scharfe | 2017-11-17 | 2 | -0/+16 |
* | | | | | | | | | | | | | Merge branch 'pw/sequencer-recover-from-unlockable-index' | Junio C Hamano | 2017-11-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | sequencer: reschedule pick if index can't be lockedpw/sequencer-recover-from-unlockable-index | Phillip Wood | 2017-11-16 | 1 | -1/+2 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | config: avoid "write_in_full(fd, buf, len) != len" patternsd/branch-copy | Phillip Wood | 2017-11-16 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' | Junio C Hamano | 2017-11-27 | 2 | -2/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-way | 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 'tz/notes-error-to-stderr' | Junio C Hamano | 2017-11-27 | 3 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderr | Todd Zullinger | 2017-11-15 | 3 | -9/+9 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rebase: fix stderr redirect in apply_autostash()tz/redirect-fix | 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 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | completion: add git config sendemail.tocmdrv/sendemail-tocmd-in-config-and-completion | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema... | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' | Junio C Hamano | 2017-11-27 | 1 | -8/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | merge-base --fork-point doc: clarify the example and failure modesjc/merge-base-fork-point-doc | Junio C Hamano | 2017-11-09 | 1 | -8/+56 |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 8 | -18/+92 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 8 | -6/+78 |
| * | | | | | | | | | | | | | | | | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 | 2 | -13/+15 |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-11-21 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Almost ready for 2.15.1 | Junio C Hamano | 2017-11-21 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 | 1 | -29/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |