summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-02-13 08:45:52 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-02-13 08:45:52 +0000
commitec3b9a7c740602964acf4b5a31612500c3aefb74 (patch)
treead8e99be0efb3752456489559ff8d42f970da2ab /git-rebase.txt
parent001a3e6a8d22aa137a852872db6f306e8cfaf6e7 (diff)
downloadgit-htmldocs-ec3b9a7c740602964acf4b5a31612500c3aefb74.tar.gz
Autogenerated HTML docs for v1.6.2-rc0-61-g5cd12
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 3d6d429e5..30487de48 100644
--- a/git-rebase.txt
+++ b/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::