Skip to content

Commit 6bc7024

Browse files
committed
fixup! builtin rebase: support -C and --whitespace=<type>
The constant `0` is not the correct one for pointers. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent fb77ec5 commit 6bc7024

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
10351035
PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
10361036
OPT_STRING_LIST(0, "whitespace", &whitespace,
10371037
N_("whitespace"), N_("passed to 'git apply'")),
1038-
OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),
1038+
OPT_SET_INT('C', NULL, &opt_c, N_("passed to 'git apply'"),
10391039
REBASE_AM),
10401040
OPT_BOOL(0, "autostash", &options.autostash,
10411041
N_("automatically stash/stash pop before and after")),

0 commit comments

Comments
 (0)