Merge branch 'jt/format-patch-from-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
"git format-patch" learned format.from configuration variable to
specify the default settings for its "--from" option.

* jt/format-patch-from-config:
format-patch: format.from gives the default for --from

1  2 
Documentation/config.txt
builtin/log.c
contrib/completion/git-completion.bash
t/t4014-format-patch.sh
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge