git-cvsserver runs hooks/post-receive

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 94478ed94d70c597c8a024afe79b456a66d40a35..d4d26afea0fef29cd3e0ca2e7bb89f71d08d4c22 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -29,10 +29,20 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
-include::urls.txt[]
+include::urls-remotes.txt[]
 
 include::merge-strategies.txt[]
 
+\--rebase::
+       Instead of a merge, perform a rebase after fetching.
+       *NOTE:* This is a potentially _dangerous_ mode of operation.
+       It rewrites history, which does not bode well when you
+       published that history already.  Do *not* use this option
+       unless you have read gitlink:git-rebase[1] carefully.
+
+\--no-rebase::
+       Override earlier \--rebase.
+
 DEFAULT BEHAVIOUR
 -----------------
 
@@ -165,4 +175,3 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-