Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d6d429e5e28d6a4520c3b54adb3ad065a3b774f..da3c38cd60dc0d143fe91417b742335cfff27809 100644 (file)
--- 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::