Merge branch 'maint'
commit8c5b85ce87d15e4db37a6408f03b0eb71dde080e
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Feb 2009 07:44:07 +0000 (19 23:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Feb 2009 07:44:07 +0000 (19 23:44 -0800)
tree71b226a7452da6d52d07a60c9957424cd64d0a19
parent7d233dea5f4e299fdac8d6cfb610bcd4d60a82b7
parente43a6fd3e94888d76779ad79fb568ed180e5fcdf
Merge branch 'maint'

* maint:
  More friendly message when locking the index fails.
  Document git blame --reverse.
  Documentation: Note file formats send-email accepts
Documentation/git-blame.txt
builtin-update-index.c
cache.h
lockfile.c