diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:29:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:29:06 -0700 |
| commit | 6a5713b576c3e54388d58984b759e1215d425bcf (patch) | |
| tree | 759ba6f8465e04fbd8267bc8c005df3a73fb22c6 /preload-index.c | |
| parent | Merge branch 'mk/merge-incomplete-files' (diff) | |
| parent | filter-branch: eliminate duplicate mapped parents (diff) | |
| download | tgif-6a5713b576c3e54388d58984b759e1215d425bcf.tar.xz | |
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
Diffstat (limited to 'preload-index.c')
0 files changed, 0 insertions, 0 deletions