Andrew's git / gitweb.git / diff
?
Merge branch 'dk/format-patch-ignore-diff-submodule'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:41:51 +0000 (13:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:41:52 +0000 (13:41 -0800)
Setting diff.submodule to 'log' made "git format-patch" produce
broken patches.

* dk/format-patch-ignore-diff-submodule:
format-patch: ignore diff.submodule setting
t4255: test am submodule with diff.submodule

1  2 
builtin/log.c patch | diff1 | diff2 | blob | history
diff --cc builtin/log.c
Simple merge