From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/3] rebase -r: support octopus merges
Date: Wed, 11 Jul 2018 10:35:08 -0700 [thread overview]
Message-ID: <xmqqbmbd3cc3.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <pull.8.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 11 Jul 2018 12:38:09 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> 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.
>
> 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
next prev parent reply other threads:[~2018-07-11 17:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 12:38 [PATCH 0/3] rebase -r: support octopus merges Johannes Schindelin via GitGitGadget
2017-12-21 14:52 ` [PATCH 2/3] rebase --rebase-merges: add support for " Johannes Schindelin via GitGitGadget
2018-07-11 18:49 ` Eric Sunshine
2018-07-11 21:52 ` Junio C Hamano
2018-07-12 13:11 ` Johannes Schindelin
2018-07-12 13:08 ` Johannes Schindelin
2017-12-22 14:10 ` [PATCH 1/3] merge: allow reading the merge commit message from a file Johannes Schindelin via GitGitGadget
2018-07-11 22:06 ` Junio C Hamano
2018-07-12 12:58 ` Johannes Schindelin
2018-07-12 16:20 ` Junio C Hamano
2018-03-09 16:36 ` [PATCH 3/3] rebase --rebase-merges: adjust man page for octopus support Johannes Schindelin via GitGitGadget
2018-07-11 17:05 ` Elijah Newren
2018-07-12 12:48 ` Johannes Schindelin
2018-07-11 17:35 ` Junio C Hamano [this message]
2018-07-11 17:47 ` [PATCH 0/3] rebase -r: support octopus merges Stefan Beller
2018-07-12 12:54 ` Johannes Schindelin
2018-07-12 16:26 ` Junio C Hamano
2018-07-13 16:42 ` Johannes Sixt
2018-07-16 17:56 ` Junio C Hamano
2018-07-12 12:49 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbmbd3cc3.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).