{"thread":{"id":"59313","subject":"[PATCH] rebase: fix capitalisation autoSquash in i18n string","startedAt":"2023-02-26T18:00:36Z","lastAt":"2023-02-26T18:00:36Z","messageCount":1,"participants":["Fangyi Zhou via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"472756","messageId":"pull.1462.git.git.1677434429160.gitgitgadget@gmail.com","threadId":"59313","inReplyTo":null,"subject":"[PATCH] rebase: fix capitalisation autoSquash in i18n string","fromName":"Fangyi Zhou via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-02-26T18:00:29Z","receivedAt":"2023-02-26T18:00:36Z","isPatch":true,"sender":{"key":"me@fangyi.io","avatar":"https://avatars.githubusercontent.com/u/7815439?v=4"},"body":"From: Fangyi Zhou <me@fangyi.io>\n\nThe config option (as documented) for rebase.autoSquash has a capital S,\nwhereas the command line option has a small case s.\n\nCf. <20220617100309.3224-1-worldhello.net@gmail.com>\n\nSigned-off-by: Fangyi Zhou <me@fangyi.io>\n---\n    rebase: fix capitalisation autoSquash in i18n string\n    \n    The config option (as documented) for rebase.autoSquash has a capital S,\n    whereas the command line option has a small case s.\n    \n    Cf. 20220617100309.3224-1-worldhello.net@gmail.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1462%2Ffangyi-zhou%2Frebase-i18n-message-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1462/fangyi-zhou/rebase-i18n-message-v1\nPull-Request: https://github.com/git/git/pull/1462\n\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 6635f10d529..9a18f9b4b89 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1513,7 +1513,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\t\tdie(_(\"apply options and merge options \"\n \t\t\t\t\t  \"cannot be used together\"));\n \t\t\telse if (options.autosquash == -1 && options.config_autosquash == 1)\n-\t\t\t\tdie(_(\"apply options are incompatible with rebase.autosquash.  Consider adding --no-autosquash\"));\n+\t\t\t\tdie(_(\"apply options are incompatible with rebase.autoSquash.  Consider adding --no-autosquash\"));\n \t\t\telse if (options.update_refs == -1 && options.config_update_refs == 1)\n \t\t\t\tdie(_(\"apply options are incompatible with rebase.updateRefs.  Consider adding --no-update-refs\"));\n \t\t\telse\n\nbase-commit: dadc8e6dacb629f46aee39bde90b6f09b73722eb\n-- \ngitgitgadget\n"}]}