Merge branch 'tb/grep-column'

"git grep" learned the "--column" option that gives not just the
line number but the column number of the hit.

* tb/grep-column:
  contrib/git-jump/git-jump: jump to exact location
  grep.c: add configuration variables to show matched option
  builtin/grep.c: add '--column' option to 'git-grep(1)'
  grep.c: display column number of first match
  grep.[ch]: extend grep_opt to allow showing matched column
  grep.c: expose {,inverted} match column in match_line()
  Documentation/config.txt: camel-case lineNumber for consistency

1 files changed, 2 insertions, 0 deletions

diff --git a/grep.h b/grep.h
index ed25be271b..01d2cba6f8 100644
--- a/grep.h
+++ b/grep.h
@@ -67,6 +67,7 @@ enum grep_color {
 	GREP_COLOR_FILENAME,
 	GREP_COLOR_FUNCTION,
 	GREP_COLOR_LINENO,
+	GREP_COLOR_COLUMNNO,
 	GREP_COLOR_MATCH_CONTEXT,
 	GREP_COLOR_MATCH_SELECTED,
 	GREP_COLOR_SELECTED,
@@ -139,6 +140,7 @@ struct grep_opt {
 	int prefix_length;
 	regex_t regexp;
 	int linenum;
+	int columnnum;
 	int invert;
 	int ignore_case;
 	int status_only;