Merge branch 'rs/grep-color-words'

Allow painting or not painting (partial) matches in context lines
when showing "grep -C<num>" output in color.

* rs/grep-color-words:
  grep: add color.grep.matchcontext and color.grep.matchselected

diff --cc Documentation/config.txt
Simple merge

diff --cc grep.c
index 4dc31ea38656f72c51bae96155053cd1cd0f6d64,f950651ae61e80cd57c6d224a461313d14cb320d..6e085f829731146c319fff57da0ae482de97ff77
--- 1/grep.c
--- 2/grep.c
+++ b/grep.c
@@@ -107,6 -105,14 +110,14 @@@ int grep_config(const char *var, const 
                color = opt->color_selected;
        else if (!strcmp(var, "color.grep.separator"))
                color = opt->color_sep;
 -              color_parse(value, var, opt->color_match_context);
 -              color_parse(value, var, opt->color_match_selected);
+       else if (!strcmp(var, "color.grep.match")) {
+               int rc = 0;
+               if (!value)
+                       return config_error_nonbool(var);
++              rc |= color_parse(value, opt->color_match_context);
++              rc |= color_parse(value, opt->color_match_selected);
+               return rc;
+       }
  
        if (color) {
                if (!value)

diff --cc t/t7810-grep.sh
Simple merge