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 <me@fangyi.io> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fangyi Zhou committed
Feb 26, 2023 at 18:00 UTC
f17a1542b28941b2f849a0185c15cd9131f46c54
1 file changed
+1
-1
builtin/rebase.c
+1
-1
@@ -1513,7 +1513,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1513
die(_("apply options and merge options "
1514
"cannot be used together"));
1515
else if (options.autosquash == -1 && options.config_autosquash == 1)
1516
- die(_("apply options are incompatible with rebase.autosquash. Consider adding --no-autosquash"));
1516
+ die(_("apply options are incompatible with rebase.autoSquash. Consider adding --no-autosquash"));
1517
else if (options.update_refs == -1 && options.config_update_refs == 1)
1518
die(_("apply options are incompatible with rebase.updateRefs. Consider adding --no-update-refs"));
1519
else