Re: [PATCH] docs(git-pull.adoc): fix man page typo
- From
- Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
- Date
- Nov 28, 2025, 13:34 UTC
- Message-ID
- <f66c3b5a-6126-4fec-9c13-e4cdd3043fa0@app.fastmail.com>
- In-Reply-To
- <pull.2111.git.git.1764335780515.gitgitgadget@gmail.com>
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:
Show 6 quoted lines
> From: snowdroppe <stefanrieche@gmail.com> > > Fix typo in man page from "git --rebase abort" > to "git rebase --abort" > > Signed-off-by: Stefan Rieche <stefanrieche@gmail.com>
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 <stefanrieche@gmail.com>` 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.
Show 29 quoted lines
> --- > 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