git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d7173d9 00588bb)

author	Junio C Hamano <gitster@pobox.com>
	Sat, 20 Mar 2010 18:29:36 +0000 (11:29 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 20 Mar 2010 18:29:36 +0000 (11:29 -0700)
commit	f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0
tree	7f668cd8acbb2b897c71125d55ac64cac5a7b529	tree \| snapshot
parent	d7173d942ea897b67ac9ba3bab2a0cc374684ca6	commit \| diff
parent	00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb	commit \| diff

Merge branch 'ml/color-grep'

* ml/color-grep:
  grep: Colorize selected, context, and function lines
  grep: Colorize filename, line number, and separator
  Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
builtin/grep.c	diff1 \|	diff2 \|	blob \| history
color.h	diff1 \|	diff2 \|	blob \| history
grep.c	diff1 \|	diff2 \|	blob \| history
grep.h	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker