Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:25:14 +0000 (14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:25:14 +0000 (14:25 -0800)
* maint:
git-send-email.txt: move --format-patch paragraph to a proper location
git-shortlog.txt: improve documentation about .mailmap files
pretty: support multiline subjects with format:
pretty: factor out format_subject()
pretty: factor out skip_empty_lines()
merge-file: handle freopen() failure
daemon: cleanup: factor out xstrdup_tolower()
daemon: cleanup: replace loop with if
daemon: handle freopen() failure
describe: Avoid unnecessary warning when using --all

Trivial merge