]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74419c2 339de50)
Merge branch 'dk/format-patch-ignore-diff-submodule' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:15 +0000 (22:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:15 +0000 (22:10 -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
Unnamed repository; edit this file 'description' to name the repository.