diff options
| author | Julia Evans <julia@jvns.ca> | 2025-12-03 15:34:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-03 13:51:29 -0800 |
| commit | 8ef7355a8ffb0273f5b4713a0b1502887f8825d0 (patch) | |
| tree | 96bf2f695f5a3b13a9684a4908ca0be2c4829fa1 | |
| parent | e9d221b0b70869fa770e95acf143149c0b8705f6 (diff) | |
| download | git-8ef7355a8ffb0273f5b4713a0b1502887f8825d0.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-pull.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index cd3bbc90e3..4df4193575 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 ------- |