![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700) | ||
| commit | 2254da06a5473ffde973337bad2c6a96eea61e20 | |
| tree | c7b1bf0ba4094dbc3e6f209e379a15b66d6864aa | tree | snapshot |
| parent | f06b9f1dffa67c1d28793bdaf7b2165d3d392d35 | commit | diff |
| parent | 3e73cb2f48cc4044905455a9936692f967a0f9b3 | commit | diff |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
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-1.6.1:
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 |