Merge branch 'maint'
commitb79376cdf3bd6ee922261776613d085a7b36ffd9
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:39 +0000 (28 00:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2009 07:46:39 +0000 (28 00:46 -0700)
tree544b5717e8c87ad8c8770273e9c79ff494441c0d
parent47afed5dc17faf10fde18789b17cf6ebff829cf4
parent2254da06a5473ffde973337bad2c6a96eea61e20
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
builtin-merge.c
grep.c