From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2014 18:29:06 +0000 (-0700)
Subject: Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'
X-Git-Tag: v2.1.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a5713b576c3e54388d58984b759e1215d425bcf;p=thirdparty%2Fgit.git

Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'

"filter-branch" left an empty single-parent commit that results when
all parents of a merge commit gets mapped to the same commit, even
under "--prune-empty".

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

6a5713b576c3e54388d58984b759e1215d425bcf