aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorMark Burton <markb@ordern.com>2009-02-12 10:21:19 +0000
committerJunio C Hamano <gitster@pobox.com>2009-02-12 16:50:28 -0800
commit7fe5438516a8121bd67ee0789cb0960b6e922225 (patch)
tree9dbca0e246e5352035380fc6f60519e61f04161a /Documentation/git-rebase.txt
parent49bde7533681f5e4a80402af465bd7a28556266e (diff)
downloadgit-7fe5438516a8121bd67ee0789cb0960b6e922225.tar.gz
git-7fe5438516a8121bd67ee0789cb0960b6e922225.tar.xz
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
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::