提交 3d0e75f2 编写于 作者: J Junio C Hamano

diff-options: unconfuse description of --color

It said "by default it is off" while it also said "the default is
always", which confused everybody who read it only once.  It wanted
to say (1) if you do not say --color, it is not enabled, and (2) if
you say --color but do not say when to enable it, it will always be
enabled".

Rephrase to clarify by using "default" only once.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 7e201053
......@@ -174,8 +174,8 @@ any of those replacements occurred.
--color[=<when>]::
Show colored diff.
The value must be `always` (the default for `<when>`), `never`, or `auto`.
The default value is `never`.
`--color` (i.e. without '=<when>') is the same as `--color=always`.
'<when>' can be one of `always`, `never`, or `auto`.
ifdef::git-diff[]
It can be changed by the `color.ui` and `color.diff`
configuration settings.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册