git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-05 17:40:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! builtin rebase: support -C and --whitespace=<type>

Browse Source 
The constant `0` is not the correct one for pointers.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-10-04 14:47:46 +02:00
parent fb77ec5460
commit 6bc7024aec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rebase.c
View File

@@ -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")),