diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:31 -0700 |
| commit | 7a06e63f821069fe959cdfe16592d9678eee06e4 (patch) | |
| tree | 62f92b6c50fe542a977e3eff142c7595bae040a2 /merge-blobs.c | |
| parent | Merge branch 'jx/do-not-crash-receive-pack-wo-head' (diff) | |
| parent | contrib/subtree: ignore log.date configuration (diff) | |
| download | git-7a06e63f821069fe959cdfe16592d9678eee06e4.tar.gz git-7a06e63f821069fe959cdfe16592d9678eee06e4.zip | |
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
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions