![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:39 +0000 (00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:39 +0000 (00:46 -0700) | ||
| commit | b79376cdf3bd6ee922261776613d085a7b36ffd9 | |
| tree | 544b5717e8c87ad8c8770273e9c79ff494441c0d | tree | snapshot |
| parent | 47afed5dc17faf10fde18789b17cf6ebff829cf4 | commit | diff |
| parent | 2254da06a5473ffde973337bad2c6a96eea61e20 | commit | diff |
Merge branch 'maint'
* maint:
grep: fix segfault when "git grep '('" is given
Documentation: fix a grammatical error in api-builtin.txt
builtin-merge: fix a typo in an error message
* maint:
grep: fix segfault when "git grep '('" is given
Documentation: fix a grammatical error in api-builtin.txt
builtin-merge: fix a typo in an error message
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| grep.c | diff1 | | diff2 | | blob | history |