Merge branch 'da/subtree-date-confusion'
commit7a06e63f821069fe959cdfe16592d9678eee06e4
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:31 +0000 (3 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:31 +0000 (3 11:01 -0700)
tree62f92b6c50fe542a977e3eff142c7595bae040a2
parent0baebca51eba05dd3c3e9edf18fc49c67b55503f
parente7aac44ed276bc0de0253baa8e3f5ac247044a31
Merge branch 'da/subtree-date-confusion'

"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