Merge branch 'maint'

* maint:
More friendly message when locking the index fails.
Document git blame --reverse.
Documentation: Note file formats send-email accepts

diff --cc Documentation/git-blame.txt
Simple merge

diff --cc builtin-update-index.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc lockfile.c
Simple merge