From: Junio C Hamano Date: Tue, 14 Mar 2017 22:23:19 +0000 (-0700) Subject: Merge branch 'dp/filter-branch-prune-empty' X-Git-Tag: v2.13.0-rc0~118 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=529635738683b4570b1cee894fa53bce66254e8b;p=thirdparty%2Fgit.git 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 --- 529635738683b4570b1cee894fa53bce66254e8b