From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2009 02:44:52 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23807fa0086ae6ad6980a2a1071f23ed1a6dde93?hp=23807fa0086ae6ad6980a2a1071f23ed1a6dde93

Merge branch 'maint'

* maint:
Prepare for 1.6.3.2
fix cat-file usage message and documentation
fetch: report ref storage DF errors more accurately
lock_ref: inform callers of unavailable ref
merge-options.txt: Clarify merge --squash

Conflicts:
RelNotes
---