From: Fangyi Zhou Date: Sun, 26 Feb 2023 18:00:29 +0000 (+0000) Subject: rebase: fix capitalisation autoSquash in i18n string X-Git-Tag: v2.41.0-rc0~159^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f17a1542b28941b2f849a0185c15cd9131f46c54;p=thirdparty%2Fgit.git rebase: fix capitalisation autoSquash in i18n string The config option (as documented) for rebase.autoSquash has a capital S, whereas the command line option has a small case s. Cf. <20220617100309.3224-1-worldhello.net@gmail.com> Signed-off-by: Fangyi Zhou Signed-off-by: Junio C Hamano --- diff --git a/builtin/rebase.c b/builtin/rebase.c index 6635f10d52..9a18f9b4b8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1513,7 +1513,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