Skip to contentSkip to conversation

rebase: fix capitalisation autoSquash in i18n string

PATCH New Fangyi Zhou via GitGitGadget 1 participant 1 message Feb 26, 2023

lore
Share & tools
lore

Fangyi Zhou via GitGitGadget

author
#0 lore raw

PATCH 1/1 rebase: fix capitalisation autoSquash in i18n string

From: Fangyi Zhou <[email protected]>

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

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

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(-)
builtin/rebase.c +1 -1
index 6635f10d529..9a18f9b4b89 100644
@@ -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

base-commit: dadc8e6dacb629f46aee39bde90b6f09b73722eb

Signature · 1 line
gitgitgadget