projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
49bde75
)
git-rebase.txt: --interactive does not work with --whitespace
author
Mark Burton
<markb@ordern.com>
Thu, 12 Feb 2009 10:21:19 +0000
(10:21 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 13 Feb 2009 00:50:28 +0000
(16:50 -0800)
Signed-off-by: Mark Burton <markb@ordern.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
patch
|
blob
|
history
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 3d6d429e5e28d6a4520c3b54adb3ad065a3b774f..30487de48fa83aa63b83043e090053c07c54456a 100644
(file)
--- 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::