projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f748e69 1dc413e)
Merge branch 'jk/filter-branch-no-index' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:13 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:13 +0000 (14:54 -0800)
commit16f5e2683304b986be49a919198d04652a126271
tree21b08ad7256c93a272a9ca6f2d4950d69ae88378tree | snapshot
parentf748e6916749e35fc54c24eb6e02e1182c62a052commit | diff
parent1dc413ebe52bd5dffed63d69a0a239b7fb6ef699commit | diff
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
git-filter-branch.sh diff1 | diff2 | blob | history
t/t7003-filter-branch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.