| commit | 6a5713b576c3e54388d58984b759e1215d425bcf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2014 18:29:06 +0000 (16 11:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2014 18:29:06 +0000 (16 11:29 -0700) | ||
| tree | 759ba6f8465e04fbd8267bc8c005df3a73fb22c6 | treesnapshot (tar.gz zip) |
| parent | 2e42338f806c2a79b691215ca3b238ac5beb57df | commitdiff |
| parent | 79bc4ef3686bc6795aa79a1d4aa6d3060a2cbd93 | commitdiff |
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
"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