Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:44:52 +0000 (19:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:44:52 +0000 (19:44 -0700)
commit23807fa0086ae6ad6980a2a1071f23ed1a6dde93
tree7e73547d4f5187bfb985282d94d358ed7b0ca255
parent3cd7388d57db4f4a29949e8de96493fb77059484
parente57cb0158209ece040a4b873064504efd7d2ec0e
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
builtin-fetch.c
refs.c