Andrew's git / gitweb.git / diff
?
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)
* 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

No differences found