On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin
<[email protected]> wrote:
> This one is a bit tricky to explain, so let's try with a diagram:
> [...]
> Signed-off-by: Johannes Schindelin <[email protected]>
> ---
> 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"));
