Merge branch 'xy/format-patch-prereq-patch-id-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
Recently added "--base" option to "git format-patch" command did
not correctly generate prereq patch ids.

* xy/format-patch-prereq-patch-id-fix:
  format-patch: clear UNINTERESTING flag before prepare_bases

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

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