Merge branch 'nd/maint-branch-desc-doc'
commit3a2ce799811c7df98a1b0cd3541f68227e587483
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Jan 2013 16:27:09 +0000 (9 08:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Jan 2013 16:27:09 +0000 (9 08:27 -0800)
treee60572cdbd98de8a4b859fab44679c8d1b84e185
parent7f27ac56a549fff45e85dae48cec713a340b0616
parent5ee29aefac94d4ed11fc5101c89697f39057abb5
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
Documentation/config.txt
builtin/branch.c
builtin/log.c
t/t4014-format-patch.sh