Merge branch 'jm/format-patch-mail-sig'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:38 +0000 (12:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:18:38 +0000 (12:18 -0700)
* jm/format-patch-mail-sig:
  format-patch: add "--signature-file=<file>" option
  format-patch: make newline after signature conditional

1  2 
Documentation/config.txt
builtin/log.c
t/t4014-format-patch.sh

Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge