| commit | 16f5e2683304b986be49a919198d04652a126271 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:13 +0000 (5 14:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:13 +0000 (5 14:54 -0800) | ||
| tree | 21b08ad7256c93a272a9ca6f2d4950d69ae88378 | treesnapshot (tar.gz zip) |
| parent | f748e6916749e35fc54c24eb6e02e1182c62a052 | commitdiff |
| parent | 1dc413ebe52bd5dffed63d69a0a239b7fb6ef699 | commitdiff |
Merge branch 'jk/filter-branch-no-index' into maint
A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.
* jk/filter-branch-no-index:
filter-branch: resolve $commit^{tree} in no-index case
A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.
* jk/filter-branch-no-index:
filter-branch: resolve $commit^{tree} in no-index case
| git-filter-branch.sh | diff1 | diff2 | blobhistory |
| t/t7003-filter-branch.sh | diff1 | diff2 | blobhistory |