Merge branch 'tr/log-full-diff-keep-true-parents' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:05 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:59:05 +0000 (11:59 -0700)
commit6930cd1...de930b09639e1dad7ae8d74f9128e404
treed3cee94...976b69449b939a6aa359c9c4dc8c0f34copy hash to clipboard (tree)
parent1e93c28...53e19945f059fd709729d724f8c06446copy hash to clipboard (diff)
parent838f9a1...667cfefa9e645c26627ce81ce7599915copy hash to clipboard (diff)
combine-diff.c
commit.c
commit.h