Andrew's git / gitweb.git / diff
?
Merge branch 'sg/filter-branch-dwim-ambiguity' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:17 +0000 (17:21 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:17 +0000 (17:21 -0500)
Fix for a corner case in filter-branch.

* sg/filter-branch-dwim-ambiguity:
filter-branch: deal with object name vs. pathname ambiguity in tree-filter

Trivial merge