From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jan 2013 16:27:09 +0000 (-0800)
Subject: Merge branch 'nd/maint-branch-desc-doc'
X-Git-Tag: v1.8.2-rc0~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a2ce799811c7df98a1b0cd3541f68227e587483;p=thirdparty%2Fgit.git

Merge branch 'nd/maint-branch-desc-doc'

Teach various forms of "format-patch" command line to identify what
branch the patches are taken from, so that the branch description
is picked up in more cases.

* nd/maint-branch-desc-doc:
  format-patch: pick up branch description when no ref is specified
  format-patch: pick up correct branch name from symbolic ref
  t4014: a few more tests on cover letter using branch description
  branch: delete branch description if it's empty
  config.txt: a few lines about branch.<name>.description
---

3a2ce799811c7df98a1b0cd3541f68227e587483