Signed-off-by: Ramsay Jones <>

Hi Pratik,

If you need to re-roll your 'pk/rebase-in-c-4-opts' branch, could
you please squash this into the relevant patch (commit b0721e7b48,
"builtin rebase: support `-C` and `--whitespace=<type>`", 2018-08-08).


Ramsay Jones

 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 42f5884ce9..fa7c5582f8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -776,7 +776,7 @@ int cmd_rebase(int argc, const char **argv, const char 
                           N_("gpg-sign?"), N_("GPG-sign commits")),
                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'"),
                OPT_BOOL(0, "autostash", &options.autostash,
                         N_("automatically stash/stash pop before and after")),

Reply via email to