This is a re-spin of the second half of Gmane 141186, "color enhancements, particularly for grep", which is currently in pu as 'ml/color-grep'. The following changes were made, all to the second patch: * Fix the parsing of color.grep. The old code caused a segfault if this option was set, and it also disallowed setting this option without a value. * Color the filename in --name-only output. I still don't like this, but I understand that makes the coloring more consistent. As Junio said, if there's no strong argument one way or the other, it's probably best to follow GNU's lead. * Style changes: Remove the cast to int for "rm_eo - rm_so", put else on same line as curly brace, and remove an unnecessary variable assignment. * Asciidoc fixes: Use ";;" instead of ":::" for nested lists, and un-indent the last sentence for color.grep.<slot>. Mark Lodato (3): Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_* grep: Colorize filename, line number, and separator grep: Colorize selected, context, and function lines Documentation/config.txt | 26 ++++++++++++++++-- builtin-grep.c | 38 +++++++++++++++++++++----- color.h | 11 +++++++ graph.c | 12 ++++---- grep.c | 66 ++++++++++++++++++++++++++++++---------------- grep.h | 6 ++++ 6 files changed, 119 insertions(+), 40 deletions(-) -- 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