From: Junio C Hamano Date: Wed, 19 Aug 2015 21:41:24 +0000 (-0700) Subject: Merge branch 'da/subtree-date-confusion' into maint X-Git-Tag: v2.5.1~20 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a30374a29a4ee9725d6ea165ead19a748eaed4c?hp=5a30374a29a4ee9725d6ea165ead19a748eaed4c 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 ---