threads / patch / 64574

patchdoc: git-pull: fix 'git --rebase abort' typo

Subject: [PATCH] doc: git-pull: fix 'git --rebase abort' typo

## tl;dr

3 messages between Dec 3, 2025 and Dec 4, 2025. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Julia Evans via GitGitGadget· Dec 3, 2025, 15:34 UTC · lore
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(-)
Show changes to Documentation/git-pull.adoc +2 −1
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
Kristoffer Haugsbakk· Dec 3, 2025, 16:14 UTC · re: Julia Evans via GitGitGadget · lore

Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo

On Wed, Dec 3, 2025, at 16:34, Julia Evans via GitGitGadget wrote:
Show 8 quoted lines
> 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>
> ---
>[snip]
There’s a patch for this: https://lore.kernel.org/git/pull.2111.v3.git.git.1764719353631.gitgitgadget@gmail.com/#t
> `git --rebase abort` should be `git rebase --abort`.
> (typo introduced in e9d221b0b)
Commits are usually referenced using
    git show -s --pretty=reference <commit>
From `Documentation/SubmittingPatches`.
Kristoffer Haugsbakk· Dec 4, 2025, 08:18 UTC · lore

Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo

On Wed, Dec 3, 2025, at 19:04, Stefan Rieche wrote:
Show 17 quoted lines
> On Wed, 3 Dec 2025 at 16:14, Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> wrote:
>> On Wed, Dec 3, 2025, at 16:34, Julia Evans via GitGitGadget wrote:
>> > 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>
>> > ---
>> >[snip]
>>
>> There’s a patch for this: https://lore.kernel.org/git/pull.2111.v3.git.git.1764719353631.gitgitgadget@gmail.com/#t
>
> Are there any outstanding actions on me?
> I'm new to email distribution lists, so sorry if I've missed
> headers / formatted any emails incorrectly.
>
Not that I know of.

By the way you sent your email that I am responding to now as multipart HTML/plaintext. I guess that’s why your email does not show up here:

https://lore.kernel.org/git/f4bdb657-6217-4ddd-aefa-10263e1af05d@app.fastmail.com/

Plain text is preferred. Certainly pure HTML emails will be dropped on the floor.

← back to recent threads