| commit | 978b5760a11846ee7e2b928aca629a065a9d876d | |
| author | Jeff King <peff@peff.net> | |
| Tue, 1 Dec 2015 22:21:17 +0000 (1 17:21 -0500) | ||
| committer | Jeff King <peff@peff.net> | |
| Tue, 1 Dec 2015 22:21:17 +0000 (1 17:21 -0500) | ||
| tree | beb3e3a37ea7b596f184b18f108e0df6f0fc50bb | treesnapshot (tar.gz zip) |
| parent | 2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4 | commitdiff |
| parent | 4d2a3646d1f0285ce072cdfe34a7df64710f9357 | commitdiff |
Merge branch 'sg/filter-branch-dwim-ambiguity' into maint
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
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