diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
| commit | c382988d7bca3bcae3119e550ff5b29bf8af0d6a (patch) | |
| tree | 43213f184f337c07b291ea28ddeb7478d71c9839 | |
| parent | 25ce0883fe62cd17f8e79d9be05c010b7b59338d (diff) | |
| parent | 8ef7355a8ffb0273f5b4713a0b1502887f8825d0 (diff) | |
Merge branch 'je/doc-pull'
Doc fixup.
* je/doc-pull:
doc: git-pull: fix 'git --rebase abort' typo
| -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 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 ------- |