On Wed, Mar 26, 2014 at 7:15 PM, Duy Nguyen <pclouds@xxxxxxxxx> wrote: > On Thu, Mar 27, 2014 at 2:13 AM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: >> On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: >>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> >>> --- >>> Documentation/git-ls-files.txt | 9 +++++++++ >>> builtin/ls-files.c | 38 +++++++++++++++++++++++++++++++++++--- >>> 2 files changed, 44 insertions(+), 3 deletions(-) >>> >>> diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt >>> index c0856a6..5c1b7f3 100644 >>> --- a/Documentation/git-ls-files.txt >>> +++ b/Documentation/git-ls-files.txt >>> @@ -147,6 +147,15 @@ a space) at the start of each line: >>> possible for manual inspection; the exact format may change at >>> any time. >>> >>> +--color[=<when>]:: >>> + Color file names. The value must be always (default), never, >>> + or auto. >> >> Here, the default is "always"... > > These (.txt changes in other patches as well) are mostly copy and > paste from existing .txt files. You may want to grep through and fix > other places as well, in a separate series. > >> >>> +--no-color:: >>> + Turn off coloring, even when the configuration file gives the >>> + default to color output, same as `--color=never`. This is the >>> + default. >> >> But, here the default is "never". > > What I mean is color is turned off by default for ls-files (in > contrast, ls has color on by default). The default 'always' means that > if you write --color without the <when> part, then it's > --color=always. How do I phrase to make it clear? Perhaps: Color file names. The value must be always, never, or auto. `--color` by itself is the same as `--color=always`. > -- > Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html