Merge branch 'dl/format-patch-cover-from-desc'

The branch description ("git branch --edit-description") has been
used to fill the body of the cover letters by the format-patch
command; this has been enhanced so that the subject can also be
filled.

* dl/format-patch-cover-from-desc:
  format-patch: teach --cover-from-description option
  format-patch: use enum variables
  format-patch: replace erroneous and condition

diff --cc Documentation/config/format.txt
Simple merge

diff --cc Documentation/git-format-patch.txt
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc t/t4014-format-patch.sh
Simple merge

diff --cc t/t9902-completion.sh
Simple merge