Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint
commit5796c5baa3ef0a7d179fdac6cb5815f75f65fd53
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:30 +0000 (22 10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jul 2014 17:28:30 +0000 (22 10:28 -0700)
tree1df36d2be4b34422fc7db95cbd8934278b4acb78
parent1a1f7b2c522814a251b77cb7dd7b0ee2e7410f88
parent79bc4ef3686bc6795aa79a1d4aa6d3060a2cbd93
Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint

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