diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 00:30:44 +0200 |
| commit | 2b9afea37207323d629953c639542c0e4c87e484 (patch) | |
| tree | f1006df3853b67d87b9cf7a914424c7c0db15867 /merge.c | |
| parent | Merge branch 'tb/grep-only-matching' (diff) | |
| parent | rebase --rebase-merges: adjust man page for octopus support (diff) | |
| download | git-2b9afea37207323d629953c639542c0e4c87e484.tar.xz git-2b9afea37207323d629953c639542c0e4c87e484.zip | |
Merge branch 'js/rebase-merge-octopus'
"git rebase --rebase-merges" mode now handles octopus merges as
well.
* js/rebase-merge-octopus:
rebase --rebase-merges: adjust man page for octopus support
rebase --rebase-merges: add support for octopus merges
merge: allow reading the merge commit message from a file
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions