{"thread":{"id":"64574","subject":"[PATCH] doc: git-pull: fix 'git --rebase abort' typo","startedAt":"2025-12-03T15:34:58Z","lastAt":"2025-12-04T08:18:41Z","messageCount":3,"participants":["Julia Evans via GitGitGadget","Kristoffer Haugsbakk"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"531626","messageId":"pull.2015.git.1764776095597.gitgitgadget@gmail.com","threadId":"64574","inReplyTo":null,"subject":"[PATCH] doc: git-pull: fix 'git --rebase abort' typo","fromName":"Julia Evans via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-12-03T15:34:55Z","receivedAt":"2025-12-03T15:34:58Z","isPatch":true,"sender":{"key":"julia@jvns.ca","avatar":"https://avatars.githubusercontent.com/u/817739?v=4"},"body":"From: Julia Evans <julia@jvns.ca>\n\n`git --rebase abort` should be `git rebase --abort`.\n(typo introduced in e9d221b0b)\n\nSigned-off-by: Julia Evans <julia@jvns.ca>\n---\n    doc: git-pull: fix 'git --rebase abort' typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-2015%2Fjvns%2Frebase-typo-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2015/jvns/rebase-typo-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/2015\n\n Documentation/git-pull.adoc | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc\nindex 248f6c3f39..88f4fd3926 100644\n--- a/Documentation/git-pull.adoc\n+++ b/Documentation/git-pull.adoc\n@@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`,\n or `pull.ff` with your preferred behaviour.\n \n If there's a merge conflict during the merge or rebase that you don't\n-want to handle, you can safely abort it with `git merge --abort` or `git\n---rebase abort`.\n+want to handle, you can safely abort it with `git merge --abort` or\n+`git rebase --abort`.\n \n OPTIONS\n -------\n\nbase-commit: f0ef5b6d9bcc258e4cbef93839d1b7465d5212b9\n-- \ngitgitgadget\n"},{"id":"531629","messageId":"f4bdb657-6217-4ddd-aefa-10263e1af05d@app.fastmail.com","threadId":"64574","inReplyTo":"pull.2015.git.1764776095597.gitgitgadget@gmail.com","subject":"Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-12-03T16:14:09Z","receivedAt":"2025-12-03T16:14:41Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Wed, Dec 3, 2025, at 16:34, Julia Evans via GitGitGadget wrote:\n> From: Julia Evans <julia@jvns.ca>\n>\n> `git --rebase abort` should be `git rebase --abort`.\n> (typo introduced in e9d221b0b)\n>\n> Signed-off-by: Julia Evans <julia@jvns.ca>\n> ---\n>[snip]\n\nThere’s a patch for this: https://lore.kernel.org/git/pull.2111.v3.git.git.1764719353631.gitgitgadget@gmail.com/#t\n\n> `git --rebase abort` should be `git rebase --abort`.\n> (typo introduced in e9d221b0b)\n\nCommits are usually referenced using\n\n    git show -s --pretty=reference <commit>\n\nFrom `Documentation/SubmittingPatches`.\n"},{"id":"531645","messageId":"e90d68eb-4e29-41ea-af29-b5eaf5988ccd@app.fastmail.com","threadId":"64574","inReplyTo":"CAAnFMuChk4873TgYoypyNBg9dzCFfqVJ4To_s2_L35_MX0P=CQ@mail.gmail.com","subject":"Re: [PATCH] doc: git-pull: fix 'git --rebase abort' typo","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-12-04T08:18:20Z","receivedAt":"2025-12-04T08:18:41Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"On Wed, Dec 3, 2025, at 19:04, Stefan Rieche wrote:\n> On Wed, 3 Dec 2025 at 16:14, Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> wrote:\n>> On Wed, Dec 3, 2025, at 16:34, Julia Evans via GitGitGadget wrote:\n>> > From: Julia Evans <julia@jvns.ca>\n>> >\n>> > `git --rebase abort` should be `git rebase --abort`.\n>> > (typo introduced in e9d221b0b)\n>> >\n>> > Signed-off-by: Julia Evans <julia@jvns.ca>\n>> > ---\n>> >[snip]\n>>\n>> There’s a patch for this: https://lore.kernel.org/git/pull.2111.v3.git.git.1764719353631.gitgitgadget@gmail.com/#t\n>\n> Are there any outstanding actions on me?\n> I'm new to email distribution lists, so sorry if I've missed\n> headers / formatted any emails incorrectly.\n>\n\nNot that I know of.\n\nBy the way you sent your email that I am responding to now as multipart\nHTML/plaintext. I guess that’s why your email does not show up here:\n\nhttps://lore.kernel.org/git/f4bdb657-6217-4ddd-aefa-10263e1af05d@app.fastmail.com/\n\nPlain text is preferred. Certainly pure HTML emails will be dropped on\nthe floor.\n"}]}