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>
This commit is contained in:
parent
49bde75336
commit
7fe5438516
@ -246,6 +246,7 @@ OPTIONS
|
|||||||
--whitespace=<nowarn|warn|error|error-all|strip>::
|
--whitespace=<nowarn|warn|error|error-all|strip>::
|
||||||
This flag is passed to the 'git-apply' program
|
This flag is passed to the 'git-apply' program
|
||||||
(see linkgit:git-apply[1]) that applies the patch.
|
(see linkgit:git-apply[1]) that applies the patch.
|
||||||
|
Incompatible with the --interactive option.
|
||||||
|
|
||||||
-i::
|
-i::
|
||||||
--interactive::
|
--interactive::
|
||||||
|
Loading…
Reference in New Issue
Block a user