diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:22 -0700 |
| commit | bfee58c0a59b2d84431b41052b774f5037cebe21 (patch) | |
| tree | 7867ba27caa9739514956f4b8d3cc502984a7c3c /mergesort.c | |
| parent | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint (diff) | |
| parent | p7000: add test for filter-branch with --prune-empty (diff) | |
| download | tgif-bfee58c0a59b2d84431b41052b774f5037cebe21.tar.xz | |
Merge branch 'dp/filter-branch-prune-empty' into maint
"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
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions