Merge branch 'xy/format-patch-base'
commit72ce3ff7b51c1e0703f433fb000519521441abf8
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:31 +0000 (23 14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:31 +0000 (23 14:54 -0700)
tree84a81f6bd529fe6d4236eabf9dca5e78b4cba07e
parent8e342255224f459ddff4d7f974161ae47d26d1d7
parentbb52995f3ec7fac2b282a91af4230e4f387af234
Merge branch 'xy/format-patch-base'

"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.

* xy/format-patch-base:
  format-patch: introduce format.useAutoBase configuration
  format-patch: introduce --base=auto option
  format-patch: add '--base' option to record base tree info
  patch-ids: make commit_patch_id() a public helper function
Documentation/config.txt
builtin/log.c
t/t4014-format-patch.sh