From: Mark Burton <markb@ordern.com>
Date: Thu, 12 Feb 2009 10:21:19 +0000 (+0000)
Subject: git-rebase.txt: --interactive does not work with --whitespace
X-Git-Tag: v1.6.2-rc1~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fe5438516a8121bd67ee0789cb0960b6e922225;p=git.git

git-rebase.txt: --interactive does not work with --whitespace

Signed-off-by: Mark Burton <markb@ordern.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d6d429e5..30487de48 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -246,6 +246,7 @@ OPTIONS
 --whitespace=<nowarn|warn|error|error-all|strip>::
 	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::