From: "Stefan Rieche via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Rieche <stefanrieche@gmail.com>,
snowdroppe <stefanrieche@gmail.com>
Subject: [PATCH v2] doc: git-pull: fix typo in command
Date: Fri, 28 Nov 2025 14:25:45 +0000 [thread overview]
Message-ID: <pull.2111.v2.git.git.1764339945182.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2111.git.git.1764335780515.gitgitgadget@gmail.com>
From: snowdroppe <stefanrieche@gmail.com>
Fix typo in git-pull doc from "git --rebase abort"
to "git rebase --abort"
Signed-off-by: snowdroppe <stefanrieche@gmail.com>
---
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 <stefanrieche@gmail.com>
## 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 <stefanrieche@gmail.com>
+ Signed-off-by: snowdroppe <stefanrieche@gmail.com>
## 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
next prev parent reply other threads:[~2025-11-28 14:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-28 13:16 [PATCH] docs(git-pull.adoc): fix man page typo Stefan Rieche via GitGitGadget
2025-11-28 13:34 ` Kristoffer Haugsbakk
2025-11-28 16:43 ` Junio C Hamano
2025-11-28 14:25 ` Stefan Rieche via GitGitGadget [this message]
2025-12-02 23:49 ` [PATCH v3] doc: fix typo in git-pull.adoc Stefan Rieche via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.2111.v2.git.git.1764339945182.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=stefanrieche@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.