Andrew's git / gitweb.git / diff
?
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)
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

1  2 
git-filter-branch.sh patch | diff1 | diff2 | blob | history
t/t7003-filter-branch.sh patch | diff1 | diff2 | blob | history
diff --cc git-filter-branch.sh
Simple merge
diff --cc t/t7003-filter-branch.sh
Simple merge