{"thread":{"id":"61013","subject":"[PATCH] rebase: fix typo in autosquash documentation","startedAt":"2024-02-27T06:33:02Z","lastAt":"2024-02-27T16:50:45Z","messageCount":2,"participants":["Richard Macklin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"489460","messageId":"pull.1676.git.1709015578890.gitgitgadget@gmail.com","threadId":"61013","inReplyTo":null,"subject":"[PATCH] rebase: fix typo in autosquash documentation","fromName":"Richard Macklin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-02-27T06:32:58Z","receivedAt":"2024-02-27T06:33:02Z","isPatch":true,"sender":{"key":"name:Richard Macklin","avatar":null},"body":"From: Richard Macklin <code@rmacklin.dev>\n\nThis is a minor follow-up to cb00f524df (rebase: rewrite\n--(no-)autosquash documentation, 2023-11-14) to fix a typo introduced in\nthat commit.\n\nSigned-off-by: Richard Macklin <code@rmacklin.dev>\n---\n    rebase: fix typo in autosquash documentation\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1676%2Frmacklin%2Ffix-typo-in-rebase-documentation-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1676/rmacklin/fix-typo-in-rebase-documentation-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1676\n\n Documentation/git-rebase.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 06206521fc3..e7e725044db 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -607,7 +607,7 @@ The recommended way to create commits with squash markers is by using the\n linkgit:git-commit[1], which take the target commit as an argument and\n automatically fill in the subject line of the new commit from that.\n +\n-Settting configuration variable `rebase.autoSquash` to true enables\n+Setting configuration variable `rebase.autoSquash` to true enables\n auto-squashing by default for interactive rebase.  The `--no-autosquash`\n option can be used to override that setting.\n +\n\nbase-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0\n-- \ngitgitgadget\n"},{"id":"489546","messageId":"xmqqv869vokg.fsf@gitster.g","threadId":"61013","inReplyTo":"pull.1676.git.1709015578890.gitgitgadget@gmail.com","subject":"Re: [PATCH] rebase: fix typo in autosquash documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-27T16:50:39Z","receivedAt":"2024-02-27T16:50:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Richard Macklin via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Richard Macklin <code@rmacklin.dev>\n>\n> This is a minor follow-up to cb00f524df (rebase: rewrite\n> --(no-)autosquash documentation, 2023-11-14) to fix a typo introduced in\n> that commit.\n>\n> Signed-off-by: Richard Macklin <code@rmacklin.dev>\n> ---\n\n[jc: andy cc'ed as the original author to give him a chance to give\nhis Acked-by]\n\n>  Documentation/git-rebase.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 06206521fc3..e7e725044db 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -607,7 +607,7 @@ The recommended way to create commits with squash markers is by using the\n>  linkgit:git-commit[1], which take the target commit as an argument and\n>  automatically fill in the subject line of the new commit from that.\n>  +\n> -Settting configuration variable `rebase.autoSquash` to true enables\n> +Setting configuration variable `rebase.autoSquash` to true enables\n\nGood eyes.  Thanks for fixing.\n\n>  auto-squashing by default for interactive rebase.  The `--no-autosquash`\n>  option can be used to override that setting.\n>  +\n>\n> base-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0\n"}]}