From: "Julia Evans via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Julia Evans <julia@jvns•ca>, Julia Evans <julia@jvns•ca>
Subject: [PATCH] doc: git-pull: fix 'git --rebase abort' typo
Date: Wed, 03 Dec 2025 15:34:55 +0000 [thread overview]
Message-ID: <pull.2015.git.1764776095597.gitgitgadget@gmail.com> (raw)
From: Julia Evans <julia@jvns•ca>
`git --rebase abort` should be `git rebase --abort`.
(typo introduced in e9d221b0b)
Signed-off-by: Julia Evans <julia@jvns•ca>
---
doc: git-pull: fix 'git --rebase abort' typo
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2015%2Fjvns%2Frebase-typo-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2015/jvns/rebase-typo-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2015
Documentation/git-pull.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc
index 248f6c3f39..88f4fd3926 100644
--- a/Documentation/git-pull.adoc
+++ b/Documentation/git-pull.adoc
@@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`,
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`.
+want to handle, you can safely abort it with `git merge --abort` or
+`git rebase --abort`.
OPTIONS
-------
base-commit: f0ef5b6d9bcc258e4cbef93839d1b7465d5212b9
--
gitgitgadget
next reply other threads:[~2025-12-03 15:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-03 15:34 Julia Evans via GitGitGadget [this message]
2025-12-03 16:14 ` [PATCH] doc: git-pull: fix 'git --rebase abort' typo Kristoffer Haugsbakk
[not found] ` <CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com>
2025-12-04 8:18 ` Kristoffer Haugsbakk
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.2015.git.1764776095597.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=julia@jvns$(echo .)ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox