Skip to content

Commit f17a154

Browse files
fangyi-zhougitster
authored andcommitted
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. <[email protected]> Signed-off-by: Fangyi Zhou <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0f05f6 commit f17a154

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
15131513
die(_("apply options and merge options "
15141514
"cannot be used together"));
15151515
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"));
15171517
else if (options.update_refs == -1 && options.config_update_refs == 1)
15181518
die(_("apply options are incompatible with rebase.updateRefs. Consider adding --no-update-refs"));
15191519
else

0 commit comments

Comments
 (0)