| commit | 529635738683b4570b1cee894fa53bce66254e8b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Mar 2017 22:23:19 +0000 (14 15:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Mar 2017 22:23:19 +0000 (14 15:23 -0700) | ||
| tree | 53ff578fbd633327c7e757fa300f573c173553c8 | treesnapshot (tar.gz zip) |
| parent | 228b78752de9d759839665764391262c0ec156cf | commitdiff |
| parent | 32da7467ebc099e6032590773827884b704980cf | commitdiff |
Merge branch 'dp/filter-branch-prune-empty'
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
* dp/filter-branch-prune-empty:
p7000: add test for filter-branch with --prune-empty
filter-branch: fix --prune-empty on parentless commits
t7003: ensure --prune-empty removes entire branch when applicable
t7003: ensure --prune-empty can prune root commit
"git filter-branch --prune-empty" drops a single-parent commit that
becomes a no-op, but did not drop a root commit whose tree is empty.
* dp/filter-branch-prune-empty:
p7000: add test for filter-branch with --prune-empty
filter-branch: fix --prune-empty on parentless commits
t7003: ensure --prune-empty removes entire branch when applicable
t7003: ensure --prune-empty can prune root commit