mirror of
https://github.com/git/git.git
synced 2024-09-27 12:11:03 +02:00
Merge branch 'fz/rebase-msg-update'
Message update. * fz/rebase-msg-update: rebase: fix capitalisation autoSquash in i18n string
This commit is contained in:
commit
5009dd4a1c
@ -1514,7 +1514,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
|
||||
|
Loading…
Reference in New Issue
Block a user