summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:31 (GMT)
commitd036d667b7f297f8305ffaaec212a95da7022ebe (patch)
tree40518ad23cc91e47c395bcfc760671a77e072c2c /grep.h
parenteb9056358ce2cd124f769886c70e1427a0182813 (diff)
parent240cf2a25744b45c514fe850363721615a1c4b8c (diff)
downloadgit-d036d667b7f297f8305ffaaec212a95da7022ebe.zip
git-d036d667b7f297f8305ffaaec212a95da7022ebe.tar.gz
git-d036d667b7f297f8305ffaaec212a95da7022ebe.tar.bz2
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
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index ed25be2..01d2cba 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;