{"thread":{"id":"64545","subject":"[PATCH] docs(git-pull.adoc): fix man page typo","startedAt":"2025-11-28T13:16:24Z","lastAt":"2025-12-02T23:49:16Z","messageCount":5,"participants":["Stefan Rieche via GitGitGadget","Kristoffer Haugsbakk","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"531398","messageId":"pull.2111.git.git.1764335780515.gitgitgadget@gmail.com","threadId":"64545","inReplyTo":null,"subject":"[PATCH] docs(git-pull.adoc): fix man page typo","fromName":"Stefan Rieche via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-11-28T13:16:20Z","receivedAt":"2025-11-28T13:16:24Z","isPatch":true,"sender":{"key":"name:Stefan Rieche","avatar":null},"body":"From: snowdroppe \n\nFix typo in man page from \"git --rebase abort\"\nto \"git rebase --abort\"\n\nSigned-off-by: Stefan Rieche \n---\n docs(git-pull.adoc): fix man page typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v1\nPull-Request: https://github.com/git/git/pull/2111\n\n Documentation/git-pull.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc\nindex cd3bbc90e3..d3006359ed 100644\n--- a/Documentation/git-pull.adoc\n+++ b/Documentation/git-pull.adoc\n@@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour.\n \n If there's a merge conflict during the merge or rebase that you don't\n want to handle, you can safely abort it with `git merge --abort` or `git\n---rebase abort`.\n+rebase --abort`.\n \n OPTIONS\n -------\n\nbase-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45\n-- \ngitgitgadget\n"},{"id":"531399","messageId":"f66c3b5a-6126-4fec-9c13-e4cdd3043fa0@app.fastmail.com","threadId":"64545","inReplyTo":"pull.2111.git.git.1764335780515.gitgitgadget@gmail.com","subject":"Re: [PATCH] docs(git-pull.adoc): fix man page typo","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-11-28T13:34:39Z","receivedAt":"2025-11-28T13:35:01Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"Nice fix.\n\n> docs(git-pull.adoc): fix man page typo\n\nCorrect, you need an “area” in front of the message. But if you want\nsomething like “docs” it would be more typical/conventional with\nsomething like this:\n\n doc: pull:\n\nor:\n\n doc: git-pull:\n\nAnd then for the rest you don’t need “man page typo” since we know that\nthis is a doc already. And “man page” is too specific since you can make\nHTML as well. Maybe:\n\n fix typo in command\n\nOn Fri, Nov 28, 2025, at 14:16, Stefan Rieche via GitGitGadget wrote:\n> From: snowdroppe \n>\n> Fix typo in man page from \"git --rebase abort\"\n> to \"git rebase --abort\"\n>\n> Signed-off-by: Stefan Rieche \n\nThe `From:` (author) and signoff line should match. See `real-name` in\n`Documentation/SubmittingPatches`. Either a pseudonym or real/preferred\nname. But it looks like you want to use your real name.\n\nI see on the PR that you have used `snowdroppe `\nas the author on the commit. You can change your config for the project\nto use the same name and email as the signoff line. Then\n\n git commit --amend --reset-author\n\nAnd force push to the branch on the remote.\n\n> ---\n> docs(git-pull.adoc): fix man page typo\n>\n> Published-As:\n> https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git\n> pr-git-2111/snowdroppe/master-v1\n> Pull-Request: https://github.com/git/git/pull/2111\n>\n> Documentation/git-pull.adoc | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc\n> index cd3bbc90e3..d3006359ed 100644\n> --- a/Documentation/git-pull.adoc\n> +++ b/Documentation/git-pull.adoc\n> @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour.\n>\n> If there's a merge conflict during the merge or rebase that you don't\n> want to handle, you can safely abort it with `git merge --abort` or `git\n> ---rebase abort`.\n> +rebase --abort`.\n>\n> OPTIONS\n> -------\n>\n> base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45\n> --\n> gitgitgadget\n"},{"id":"531400","messageId":"pull.2111.v2.git.git.1764339945182.gitgitgadget@gmail.com","threadId":"64545","inReplyTo":"pull.2111.git.git.1764335780515.gitgitgadget@gmail.com","subject":"[PATCH v2] doc: git-pull: fix typo in command","fromName":"Stefan Rieche via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-11-28T14:25:45Z","receivedAt":"2025-11-28T14:25:47Z","isPatch":true,"sender":{"key":"name:Stefan Rieche","avatar":null},"body":"From: snowdroppe \n\nFix typo in git-pull doc from \"git --rebase abort\"\nto \"git rebase --abort\"\n\nSigned-off-by: snowdroppe \n---\n doc: git-pull: fix typo in command\n \n Changes since v1:\n \n * Updated commit message as suggested by Kristoffer Haugsbakk cc:\n \"Kristoffer Haugsbakk\" kristofferhaugsbakk@fastmail.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v2\nPull-Request: https://github.com/git/git/pull/2111\n\nRange-diff vs v1:\n\n 1: 5a37a725df ! 1: a4a2c58461 docs(git-pull.adoc): fix man page typo\n @@ Metadata\n Author: snowdroppe \n \n ## Commit message ##\n - docs(git-pull.adoc): fix man page typo\n + doc: git-pull: fix typo in command\n \n - Fix typo in man page from \"git --rebase abort\"\n + Fix typo in git-pull doc from \"git --rebase abort\"\n to \"git rebase --abort\"\n \n - Signed-off-by: Stefan Rieche \n + Signed-off-by: snowdroppe \n \n ## Documentation/git-pull.adoc ##\n @@ Documentation/git-pull.adoc: or `pull.ff` with your preferred behaviour.\n\n\n Documentation/git-pull.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc\nindex cd3bbc90e3..d3006359ed 100644\n--- a/Documentation/git-pull.adoc\n+++ b/Documentation/git-pull.adoc\n@@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour.\n \n If there's a merge conflict during the merge or rebase that you don't\n want to handle, you can safely abort it with `git merge --abort` or `git\n---rebase abort`.\n+rebase --abort`.\n \n OPTIONS\n -------\n\nbase-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45\n-- \ngitgitgadget\n"},{"id":"531404","messageId":"xmqqy0nqhzvr.fsf@gitster.g","threadId":"64545","inReplyTo":"f66c3b5a-6126-4fec-9c13-e4cdd3043fa0@app.fastmail.com","subject":"Re: [PATCH] docs(git-pull.adoc): fix man page typo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-11-28T16:43:04Z","receivedAt":"2025-11-28T16:43:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kristoffer Haugsbakk\" writes:\n\n> Nice fix.\n>\n>> docs(git-pull.adoc): fix man page typo\n>\n> Correct, you need an “area” in front of the message. But if you want\n> something like “docs” it would be more typical/conventional with\n> something like this:\n>\n> doc: pull:\n>\n> or:\n>\n> doc: git-pull:\n\nor\n\n\tdoc: fix typo in git-pull.adoc\n\n>> Fix typo in man page from \"git --rebase abort\"\n>> to \"git rebase --abort\"\n>>\n>> Signed-off-by: Stefan Rieche \n>\n> The `From:` (author) and signoff line should match. See `real-name` in\n> `Documentation/SubmittingPatches`. Either a pseudonym or real/preferred\n> name. But it looks like you want to use your real name.\n>\n> I see on the PR that you have used `snowdroppe `\n> as the author on the commit. You can change your config for the project\n> to use the same name and email as the signoff line. Then\n>\n> git commit --amend --reset-author\n>\n> And force push to the branch on the remote.\n\nGreat. Which would mean that the in-body From: line early in the\nmessage will also say Stefan Rieche, not snowdroppe.\n\nThanks for a review.\n"},{"id":"531595","messageId":"pull.2111.v3.git.git.1764719353631.gitgitgadget@gmail.com","threadId":"64545","inReplyTo":"pull.2111.v2.git.git.1764339945182.gitgitgadget@gmail.com","subject":"[PATCH v3] doc: fix typo in git-pull.adoc","fromName":"Stefan Rieche via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-12-02T23:49:13Z","receivedAt":"2025-12-02T23:49:16Z","isPatch":true,"sender":{"key":"name:Stefan Rieche","avatar":null},"body":"From: snowdroppe \n\nFix typo in git-pull.doc from \"git --rebase abort\"\nto \"git rebase --abort\"\n\nSigned-off-by: snowdroppe \n---\n doc: fix typo in git-pull.adoc\n \n Changes since v1:\n \n * Updated commit message as suggested by Kristoffer Haugsbakk\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v3\nPull-Request: https://github.com/git/git/pull/2111\n\nRange-diff vs v2:\n\n 1: a4a2c58461 ! 1: 7ea5aabac5 doc: git-pull: fix typo in command\n @@ Metadata\n Author: snowdroppe \n \n ## Commit message ##\n - doc: git-pull: fix typo in command\n + doc: fix typo in git-pull.adoc\n \n - Fix typo in git-pull doc from \"git --rebase abort\"\n + Fix typo in git-pull.doc from \"git --rebase abort\"\n to \"git rebase --abort\"\n \n Signed-off-by: snowdroppe \n\n\n Documentation/git-pull.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc\nindex cd3bbc90e3..d3006359ed 100644\n--- a/Documentation/git-pull.adoc\n+++ b/Documentation/git-pull.adoc\n@@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour.\n \n If there's a merge conflict during the merge or rebase that you don't\n want to handle, you can safely abort it with `git merge --abort` or `git\n---rebase abort`.\n+rebase --abort`.\n \n OPTIONS\n -------\n\nbase-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45\n-- \ngitgitgadget\n"}]}