git: ensure 0/1/2 are open in main()

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index defb544ed0af407a2e6360355bad34b1cb43fed9..638456b68c1353aae3c877d62fdb115d1535d0a4 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -101,6 +101,7 @@ include::merge-options.txt[]
 
 :git-pull: 1
 
+-r::
 --rebase::
        Rebase the current branch on top of the upstream branch after
        fetching.  If there is a remote-tracking branch corresponding to
@@ -217,7 +218,7 @@ $ git merge origin/next
 ------------------------------------------------
 
 
-If you tried a pull which resulted in a complex conflicts and
+If you tried a pull which resulted in complex conflicts and
 would want to start over, you can recover with 'git reset'.