Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins
From: Eric Sunshine <hidden>
Date: 2018-01-20 01:11:31
On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin [off-list ref] wrote:
quoted hunk ↗ jump to hunk
This one is a bit tricky to explain, so let's try with a diagram: [...] Signed-off-by: Johannes Schindelin <redacted> ---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"));