diff options
Diffstat (limited to 'builtin/rebase.c')
-rw-r--r-- | builtin/rebase.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 76cce94373..dbc8f90ef0 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -6,6 +6,10 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" +#include "environment.h" +#include "gettext.h" +#include "hex.h" #include "run-command.h" #include "exec-cmd.h" #include "strvec.h" @@ -29,6 +33,7 @@ #include "rebase-interactive.h" #include "reset.h" #include "hook.h" +#include "wrapper.h" static char const * const builtin_rebase_usage[] = { N_("git rebase [-i] [options] [--exec <cmd>] " @@ -1516,7 +1521,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die(_("apply options and merge options " "cannot be used together")); else if (options.autosquash == -1 && options.config_autosquash == 1) - die(_("apply options are incompatible with rebase.autosquash. Consider adding --no-autosquash")); + die(_("apply options are incompatible with rebase.autoSquash. Consider adding --no-autosquash")); else if (options.update_refs == -1 && options.config_update_refs == 1) die(_("apply options are incompatible with rebase.updateRefs. Consider adding --no-update-refs")); else |