| commit | 3e73cb2f48cc4044905455a9936692f967a0f9b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:20 +0000 (28 00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:20 +0000 (28 00:46 -0700) | ||
| tree | 9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 | treesnapshot (tar.gz zip) |
| parent | cc137194519a8ddbc0514da088fb012bea40df51 | commitdiff |
| parent | c922b01f54c4bebe84daeacf014cfbc8dc68479b | commitdiff |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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.0:
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 | blobhistory |
| grep.c | diff1 | diff2 | blobhistory |
| t/t7002-grep.sh | diff1 | diff2 | blobhistory |