builtin/merge_recursive.c: Add an usage string and make use of it.

diff --git a/builtin/grep.c b/builtin/grep.c
index 232cd1ce07bf3f695c722e6217ce653ff704d64b..597f76bc42f51e0fc1906c287981e3d37dc0f536 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1001,6 +1001,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        if (show_in_pager == default_pager)
                show_in_pager = git_pager(1);
        if (show_in_pager) {
+               opt.color = 0;
                opt.name_only = 1;
                opt.null_following_name = 1;
                opt.output_priv = &path_list;