# [PATCH] docs(git-pull.adoc): fix man page typo 5 messages from 2025-11-28 to 2025-12-02. Participants: Stefan Rieche via GitGitGadget, Kristoffer Haugsbakk, Junio C Hamano. Thread: https://gitlist.dev/t/64545 ## Stefan Rieche via GitGitGadget, 2025-11-28 13:16 Subject: [PATCH] docs(git-pull.adoc): fix man page typo Message-ID: URL: https://gitlist.dev/e/pull.2111.git.git.1764335780515.gitgitgadget%40gmail.com ``` From: snowdroppe Fix typo in man page from "git --rebase abort" to "git rebase --abort" Signed-off-by: Stefan Rieche --- docs(git-pull.adoc): fix man page typo Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v1 Pull-Request: https://github.com/git/git/pull/2111 Documentation/git-pull.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index cd3bbc90e3..d3006359ed 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour. If there's a merge conflict during the merge or rebase that you don't want to handle, you can safely abort it with `git merge --abort` or `git ---rebase abort`. +rebase --abort`. OPTIONS ------- base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45 -- gitgitgadget ``` ## Kristoffer Haugsbakk, 2025-11-28 13:34 Subject: Re: [PATCH] docs(git-pull.adoc): fix man page typo Message-ID: URL: https://gitlist.dev/e/f66c3b5a-6126-4fec-9c13-e4cdd3043fa0%40app.fastmail.com In-Reply-To: ``` Nice fix. > docs(git-pull.adoc): fix man page typo Correct, you need an “area” in front of the message. But if you want something like “docs” it would be more typical/conventional with something like this: doc: pull: or: doc: git-pull: And then for the rest you don’t need “man page typo” since we know that this is a doc already. And “man page” is too specific since you can make HTML as well. Maybe: fix typo in command On Fri, Nov 28, 2025, at 14:16, Stefan Rieche via GitGitGadget wrote: > From: snowdroppe > > Fix typo in man page from "git --rebase abort" > to "git rebase --abort" > > Signed-off-by: Stefan Rieche The `From:` (author) and signoff line should match. See `real-name` in `Documentation/SubmittingPatches`. Either a pseudonym or real/preferred name. But it looks like you want to use your real name. I see on the PR that you have used `snowdroppe ` as the author on the commit. You can change your config for the project to use the same name and email as the signoff line. Then git commit --amend --reset-author And force push to the branch on the remote. > --- > docs(git-pull.adoc): fix man page typo > > Published-As: > https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git > pr-git-2111/snowdroppe/master-v1 > Pull-Request: https://github.com/git/git/pull/2111 > > Documentation/git-pull.adoc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc > index cd3bbc90e3..d3006359ed 100644 > --- a/Documentation/git-pull.adoc > +++ b/Documentation/git-pull.adoc > @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour. > > If there's a merge conflict during the merge or rebase that you don't > want to handle, you can safely abort it with `git merge --abort` or `git > ---rebase abort`. > +rebase --abort`. > > OPTIONS > ------- > > base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45 > -- > gitgitgadget ``` ## Stefan Rieche via GitGitGadget, 2025-11-28 14:25 Subject: [PATCH v2] doc: git-pull: fix typo in command Message-ID: URL: https://gitlist.dev/e/pull.2111.v2.git.git.1764339945182.gitgitgadget%40gmail.com In-Reply-To: ``` From: snowdroppe Fix typo in git-pull doc from "git --rebase abort" to "git rebase --abort" Signed-off-by: snowdroppe --- doc: git-pull: fix typo in command Changes since v1: * Updated commit message as suggested by Kristoffer Haugsbakk cc: "Kristoffer Haugsbakk" kristofferhaugsbakk@fastmail.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v2 Pull-Request: https://github.com/git/git/pull/2111 Range-diff vs v1: 1: 5a37a725df ! 1: a4a2c58461 docs(git-pull.adoc): fix man page typo @@ Metadata Author: snowdroppe ## Commit message ## - docs(git-pull.adoc): fix man page typo + doc: git-pull: fix typo in command - Fix typo in man page from "git --rebase abort" + Fix typo in git-pull doc from "git --rebase abort" to "git rebase --abort" - Signed-off-by: Stefan Rieche + Signed-off-by: snowdroppe ## Documentation/git-pull.adoc ## @@ Documentation/git-pull.adoc: or `pull.ff` with your preferred behaviour. Documentation/git-pull.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index cd3bbc90e3..d3006359ed 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour. If there's a merge conflict during the merge or rebase that you don't want to handle, you can safely abort it with `git merge --abort` or `git ---rebase abort`. +rebase --abort`. OPTIONS ------- base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45 -- gitgitgadget ``` ## Junio C Hamano, 2025-11-28 16:43 Subject: Re: [PATCH] docs(git-pull.adoc): fix man page typo Message-ID: URL: https://gitlist.dev/e/xmqqy0nqhzvr.fsf%40gitster.g In-Reply-To: ``` "Kristoffer Haugsbakk" writes: > Nice fix. > >> docs(git-pull.adoc): fix man page typo > > Correct, you need an “area” in front of the message. But if you want > something like “docs” it would be more typical/conventional with > something like this: > > doc: pull: > > or: > > doc: git-pull: or doc: fix typo in git-pull.adoc >> Fix typo in man page from "git --rebase abort" >> to "git rebase --abort" >> >> Signed-off-by: Stefan Rieche > > The `From:` (author) and signoff line should match. See `real-name` in > `Documentation/SubmittingPatches`. Either a pseudonym or real/preferred > name. But it looks like you want to use your real name. > > I see on the PR that you have used `snowdroppe ` > as the author on the commit. You can change your config for the project > to use the same name and email as the signoff line. Then > > git commit --amend --reset-author > > And force push to the branch on the remote. Great. Which would mean that the in-body From: line early in the message will also say Stefan Rieche, not snowdroppe. Thanks for a review. ``` ## Stefan Rieche via GitGitGadget, 2025-12-02 23:49 Subject: [PATCH v3] doc: fix typo in git-pull.adoc Message-ID: URL: https://gitlist.dev/e/pull.2111.v3.git.git.1764719353631.gitgitgadget%40gmail.com In-Reply-To: ``` From: snowdroppe Fix typo in git-pull.doc from "git --rebase abort" to "git rebase --abort" Signed-off-by: snowdroppe --- doc: fix typo in git-pull.adoc Changes since v1: * Updated commit message as suggested by Kristoffer Haugsbakk Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2111%2Fsnowdroppe%2Fmaster-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2111/snowdroppe/master-v3 Pull-Request: https://github.com/git/git/pull/2111 Range-diff vs v2: 1: a4a2c58461 ! 1: 7ea5aabac5 doc: git-pull: fix typo in command @@ Metadata Author: snowdroppe ## Commit message ## - doc: git-pull: fix typo in command + doc: fix typo in git-pull.adoc - Fix typo in git-pull doc from "git --rebase abort" + Fix typo in git-pull.doc from "git --rebase abort" to "git rebase --abort" Signed-off-by: snowdroppe Documentation/git-pull.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index cd3bbc90e3..d3006359ed 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -38,7 +38,7 @@ or `pull.ff` with your preferred behaviour. If there's a merge conflict during the merge or rebase that you don't want to handle, you can safely abort it with `git merge --abort` or `git ---rebase abort`. +rebase --abort`. OPTIONS ------- base-commit: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45 -- gitgitgadget ```