summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
commitd7173d942ea897b67ac9ba3bab2a0cc374684ca6 (patch)
tree30470f05d89570e5d2e125feb140b4b3da630a39 /grep.h
parent49559cad6cab8af548321249d320d9bb372d1859 (diff)
parent8b124135a97b593d50a90abcec231552b31c7ade (diff)
downloadgit-d7173d942ea897b67ac9ba3bab2a0cc374684ca6.tar.gz
Merge branch 'jc/color-attrs'
* jc/color-attrs: color: allow multiple attributes
Diffstat (limited to 'grep.h')
0 files changed, 0 insertions, 0 deletions