From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Apr 2013 18:49:11 +0000 (-0700)
Subject: Merge branch 'fc/send-email-annotate'
X-Git-Tag: v1.8.3-rc0~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=288aa7534ae79eef03f79aaec355a7eedb08ddfa;p=git

Merge branch 'fc/send-email-annotate'

Allows format-patch --cover-letter to be configurable; the most
notable is the "auto" mode to create cover-letter only for multi
patch series.

* fc/send-email-annotate:
  rebase-am: explicitly disable cover-letter
  format-patch: trivial cleanups
  format-patch: add format.coverLetter configuration variable
  log: update to OPT_BOOL
  format-patch: refactor branch name calculation
  format-patch: improve head calculation for cover-letter
  send-email: make annotate configurable
---

288aa7534ae79eef03f79aaec355a7eedb08ddfa