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

author	Junio C Hamano <gitster@pobox.com>
	Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700)
commit	9fddaf78964a835160a0b27cdac724c27aab09bf
tree	bc7d01f3fc383385b11f8931beaf2a114eab9620	tree \| snapshot
parent	dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c	commit \| diff
parent	92e61831fb2c8d5b874405906510230fd0f10998	commit \| diff

Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

* jc/maint-grep-untracked-exclude:
grep: fix the error message that mentions --exclude

Conflicts:
builtin/grep.c

builtin/grep.c

diff1 |

diff2 |

blob | history

Git—the stupid content tracker

RSS Atom