diff mbox series

rebase: fix capitalisation autoSquash in i18n string

Message ID pull.1462.git.git.1677434429160.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit f17a1542b28941b2f849a0185c15cd9131f46c54
Headers show
Series rebase: fix capitalisation autoSquash in i18n string | expand

Commit Message

Fangyi Zhou Feb. 26, 2023, 6 p.m. UTC 
From: Fangyi Zhou <me@fangyi.io>

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>
---
    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

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1462%2Ffangyi-zhou%2Frebase-i18n-message-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1462/fangyi-zhou/rebase-i18n-message-v1
Pull-Request: https://github.com/git/git/pull/1462

 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: dadc8e6dacb629f46aee39bde90b6f09b73722eb
diff mbox series

Patch

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 6635f10d529..9a18f9b4b89 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