diff options
Diffstat (limited to 'Documentation/git-pull.adoc')
| -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 ------- |