diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-17 14:03:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-17 14:03:10 -0700 |
| commit | 5009dd4a1c1b18b3093d9a37e6508d218c1e8876 (patch) | |
| tree | 1ae7750aded2e76317d3c23e95c3435912ea433d /builtin/rebase.c | |
| parent | 4d87411ffe2432efa8800b9e9d889241dd0f1f07 (diff) | |
| parent | f17a1542b28941b2f849a0185c15cd9131f46c54 (diff) | |
| download | git-5009dd4a1c1b18b3093d9a37e6508d218c1e8876.tar.gz | |
Merge branch 'fz/rebase-msg-update'
Message update.
* fz/rebase-msg-update:
rebase: fix capitalisation autoSquash in i18n string
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index ef8ce2f72c..dd31d5ab91 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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 |