diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
| commit | c06951894ac943b2aaa288b0e9dc1eb605dfb7b6 (patch) | |
| tree | c84152355c7fe666d0bb16197e36eb63e33e0c13 /builtin-grep.c | |
| parent | Merge branch 'ac/cvsimport-revision-mapping' (diff) | |
| parent | Add an optional argument for --color options (diff) | |
| download | tgif-c06951894ac943b2aaa288b0e9dc1eb605dfb7b6.tar.xz | |
Merge branch 'ml/color-when'
* ml/color-when:
Add an optional argument for --color options
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index d05107dd9f..40b9a93127 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -811,7 +811,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) "print NUL after filenames"), OPT_BOOLEAN('c', "count", &opt.count, "show the number of matches instead of matching lines"), - OPT_SET_INT(0, "color", &opt.color, "highlight matches", 1), + OPT__COLOR(&opt.color, "highlight matches"), OPT_GROUP(""), OPT_CALLBACK('C', NULL, &opt, "n", "show <n> context lines before and after matches", |