Merge branch 'jm/format-patch-mail-sig' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:36:07 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:36:07 +0000 (13:36 -0700)
commit310f59e2632bac5e0e85e85e25014309521e2473
treefc7187c14eee3a33b6dd2fd998a8cd1dd7e5e157
parent30e9212bc06e7ffb5652aff2a85602e4ce1098f2
parent7022650f61ff7d7c9297db4a04f4e93ae14e1750
Merge branch 'jm/format-patch-mail-sig' into next

* jm/format-patch-mail-sig:
  format-patch: add "--signature-file=<file>" option
  format-patch: make newline after signature conditional
Documentation/config.txt
builtin/log.c
t/t4014-format-patch.sh