Browse Source

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>
maint
Mark Burton 16 years ago committed by Junio C Hamano
parent
commit
7fe5438516
  1. 1
      Documentation/git-rebase.txt

1
Documentation/git-rebase.txt

@ -246,6 +246,7 @@ OPTIONS @@ -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::

Loading…
Cancel
Save