Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into next
commit860cfeadfb075a51ac0257ba1d39e7f0f24611f5
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 22:00:28 +0000 (10 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 22:00:28 +0000 (10 15:00 -0700)
treec1fb544a49a70d21840793cb9c8debd814fe352a
parentd1115f4ab145e9ed0aef94f5615c237bd7ffb91a
parent79bc4ef3686bc6795aa79a1d4aa6d3060a2cbd93
Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into next

* cb/filter-branch-prune-empty-degenerate-merges:
  filter-branch: eliminate duplicate mapped parents