From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2009 07:46:20 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3-rc4~6^2~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e73cb2f48cc4044905455a9936692f967a0f9b3;p=git.git

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
---

3e73cb2f48cc4044905455a9936692f967a0f9b3