* [PATCH] doc: git-pull: fix 'git --rebase abort' typo
@ 2025-12-03 15:34 Julia Evans via GitGitGadget
2025-12-03 16:14 ` Kristoffer Haugsbakk
0 siblings, 1 reply; 3+ messages in thread
From: Julia Evans via GitGitGadget @ 2025-12-03 15:34 UTC (permalink / raw)
To: git; +Cc: Julia Evans, Julia Evans
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo 2025-12-03 15:34 [PATCH] doc: git-pull: fix 'git --rebase abort' typo Julia Evans via GitGitGadget @ 2025-12-03 16:14 ` Kristoffer Haugsbakk [not found] ` <CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com> 0 siblings, 1 reply; 3+ messages in thread From: Kristoffer Haugsbakk @ 2025-12-03 16:14 UTC (permalink / raw) To: Josh Soref, git; +Cc: Julia Evans, Stefan Rieche 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 > `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`. ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com>]
* Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo [not found] ` <CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com> @ 2025-12-04 8:18 ` Kristoffer Haugsbakk 0 siblings, 0 replies; 3+ messages in thread From: Kristoffer Haugsbakk @ 2025-12-04 8:18 UTC (permalink / raw) To: Stefan Rieche; +Cc: Josh Soref, git, Julia Evans On Wed, Dec 3, 2025, at 19:04, Stefan Rieche wrote: > 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. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-04 8:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-03 15:34 [PATCH] doc: git-pull: fix 'git --rebase abort' typo Julia Evans via GitGitGadget
2025-12-03 16:14 ` Kristoffer Haugsbakk
[not found] ` <CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com>
2025-12-04 8:18 ` Kristoffer Haugsbakk
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox