docs(git-pull.adoc): fix man page typo

From: snowdroppe <[email protected]>

Fix typo in man page from "git --rebase abort"
to "git rebase --abort"

---
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(-)

index cd3bbc90e3..d3006359ed 100644
@@ -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

Nice fix.

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

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 <[email protected]> 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.

or

doc: fix typo in git-pull.adoc

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.

From: snowdroppe <[email protected]>

Fix typo in git-pull doc from "git --rebase abort" to "git rebase --abort"

---
doc: git-pull: fix typo in command

Changes since v1:

* Updated commit message as suggested by Kristoffer Haugsbakk cc:
"Kristoffer Haugsbakk" [email protected]

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 <[email protected]>

## 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 <[email protected]>
+ Signed-off-by: snowdroppe <[email protected]>

## 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(-)

index cd3bbc90e3..d3006359ed 100644
@@ -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

From: snowdroppe <[email protected]>

Fix typo in git-pull.doc from "git --rebase abort" to "git rebase --abort"

---
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 <[email protected]>

## 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"

 Documentation/git-pull.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index cd3bbc90e3..d3006359ed 100644
@@ -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