Re: [PATCH 0/3] rebase -r: support octopus merges
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 11, 2018, 17:35 UTC
- Message-ID
- <xmqqbmbd3cc3.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <pull.8.git.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> The `--rebase-merges` option of `git rebase` generates todo lists that include the merge commits that are to be rebased. > > To keep things simpler to review, I decided to support only regular, 2-parent merge commits first. > > With this patch series, support is extended to cover also octopus merges.
;-)
To be honest, I am not sure if there still are people who use octopus (even though I freely admit that I am guilty of inventing the term and the mechanism), given its downsides, primary one of which is that it makes bisection less efficient.
Nevertheless, this *is* the right thing to do from feature completeness point of view. Thanks for following it through.
Show 18 quoted lines
> > Johannes Schindelin (3): > merge: allow reading the merge commit message from a file > rebase --rebase-merges: add support for octopus merges > rebase --rebase-merges: adjust man page for octopus support > > Documentation/git-merge.txt | 10 ++- > Documentation/git-rebase.txt | 7 +- > builtin/merge.c | 32 +++++++ > sequencer.c | 168 ++++++++++++++++++++++++++--------- > t/t3430-rebase-merges.sh | 34 +++++++ > 5 files changed, 204 insertions(+), 47 deletions(-) > > > base-commit: e3331758f12da22f4103eec7efe1b5304a9be5e9 > Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-8%2Fdscho%2Fsequencer-and-octopus-merges-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-8/dscho/sequencer-and-octopus-merges-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/8