Merge branch 'je/doc-pull' Doc fixup. * je/doc-pull: doc: git-pull: fix 'git --rebase abort' typo
diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index 248f6c3..88f4fd3 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc
@@ -37,8 +37,8 @@ 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 -------