Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit28ae2b7a6da853477fba82dc600c53165771ffa6
authorJakub Narebski <jnareb@gmail.com>
Wed, 27 May 2009 08:26:07 +0000 (27 10:26 +0200)
committerJakub Narebski <jnareb@gmail.com>
Wed, 27 May 2009 08:26:07 +0000 (27 10:26 +0200)
treedcf55445f4fe4046f633e6a28f6abd147307e431
parent0f90a5490c7a9e8d8e694f15f357cb5043aea5ee
parent33fd7169ed6658e898b414a66aefaad16b404ec5
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Update draft release notes to 1.6.4
  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
  convert bare readlink to strbuf_readlink
  merge-options.txt: Clarify merge --squash