]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d10e2cb 1dc413e)
Merge branch 'jk/filter-branch-no-index'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:12 +0000 (16:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:12 +0000 (16:10 -0800)
commita2ec9484c1517305e2e28d64d8d77642f05e9a02
tree7e6486c835da8f8a676e2be9f9f03652e2882a45tree | snapshot
parentd10e2cb9d0299a26f43d57dd5bdcf2b3f86a30b3commit | diff
parent1dc413ebe52bd5dffed63d69a0a239b7fb6ef699commit | diff
Merge branch 'jk/filter-branch-no-index'

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.