From 6bc7024aecdb1aeb2760c519f7b26e6e5ef21051 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 4 Oct 2018 14:47:46 +0200 Subject: [PATCH] fixup! builtin rebase: support `-C` and `--whitespace=` The constant `0` is not the correct one for pointers. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 43bc6f7915..3e08bdb6a4 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1035,7 +1035,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_STRING_LIST(0, "whitespace", &whitespace, N_("whitespace"), N_("passed to 'git apply'")), - OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"), + OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"), REBASE_AM), OPT_BOOL(0, "autostash", &options.autostash, N_("automatically stash/stash pop before and after")),