Merge branch 'da/subtree-date-confusion' into maint
commit5a30374a29a4ee9725d6ea165ead19a748eaed4c
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:24 +0000 (19 14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:25 +0000 (19 14:41 -0700)
tree7027cad79019819a66c130d9764ec92544d69bf3
parente88b8586bfd967cbfec62359cf4c53ec65848054
parente7aac44ed276bc0de0253baa8e3f5ac247044a31
Merge branch 'da/subtree-date-confusion' into maint

"git subtree" (in contrib/) depended on "git log" output to be
stable, which was a no-no.  Apply a workaround to force a
particular date format.

* da/subtree-date-confusion:
  contrib/subtree: ignore log.date configuration
contrib/subtree/git-subtree.sh
contrib/subtree/t/t7900-subtree.sh