"diff --check" should affect exit status

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e1eb2c1d0037f06dbf2b5cc0bde84918157ee2bf..d4d26afea0fef29cd3e0ca2e7bb89f71d08d4c22 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -33,6 +33,16 @@ 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
 -----------------