From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 27 Dec 2008 22:25:14 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc0~208
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=159c88e5ae95c5b02298193c1658fac5919c8012;p=git.git

Merge branch 'maint'

* 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
---

159c88e5ae95c5b02298193c1658fac5919c8012