X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=da3c38cd60dc0d143fe91417b742335cfff27809;hb=2e2e91d6b27f522707322835a1f8c4a5e18a2419;hp=3d6d429e5e28d6a4520c3b54adb3ad065a3b774f;hpb=07adc43f3a17a34111e17eadef3f6f4eef3eb67a;p=git.git

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d6d429e5..da3c38cd6 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -243,9 +243,10 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
---whitespace=<nowarn|warn|error|error-all|strip>::
+--whitespace=<option>::
 	This flag is passed to the 'git-apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
+	Incompatible with the --interactive option.
 
 -i::
 --interactive::