提交 7fe54385 编写于 作者: M Mark Burton 提交者: Junio C Hamano

git-rebase.txt: --interactive does not work with --whitespace

Signed-off-by: NMark Burton <markb@ordern.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 49bde753
......@@ -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::
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册