doc: git-pull: fix 'git --rebase abort' typo
An earlier commit e9d221b0 (doc: git-pull: clarify how to exit a conflicted merge, 2025-10-15) misspelt `git rebase --abort` to `git --rebase abort`. Fix it. Signed-off-by: Julia Evans <julia@jvns.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Julia Evans committed
Dec 3, 2025 at 15:34 UTC
8ef7355a8ffb0273f5b4713a0b1502887f8825d0
1 file changed
+2
-2
Documentation/git-pull.adoc
+2
-2
@@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`,
37
or `pull.ff` with your preferred behaviour.
38
39
If there's a merge conflict during the merge or rebase that you don't
40
-want to handle, you can safely abort it with `git merge --abort` or `git
41
---rebase abort`.
40
+want to handle, you can safely abort it with `git merge --abort` or
41
+`git rebase --abort`.
42
43
OPTIONS
44
-------