Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jan 20, 2018, 01:09 UTC
- Message-ID
- <CAPig+cRcj7nDv1+nmzw5WiOBLPB00EBv-tz=6sLAzM3iXLKvFw@mail.gmail.com>
- In-Reply-To
- <e3c3c703f8eae723c4fbbd08d2c329d81179dbee.1516225925.git.johannes.schindelin@gmx.de>
On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
Show 7 quoted lines
> This one is a bit tricky to explain, so let's try with a diagram: > [...] > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c > @@ -57,8 +59,13 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) > + if (no_rebase_cousins >= 0&& !recreate_merges)
Style: space before &&
> + warning(_("--[no-]rebase-cousins has no effect without "
> + "--recreate-merges"));