From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 22:21:17 +0000 (-0500)
Subject: Merge branch 'sg/filter-branch-dwim-ambiguity' into maint
X-Git-Tag: v2.6.4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=978b5760a11846ee7e2b928aca629a065a9d876d;p=thirdparty%2Fgit.git

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
---

978b5760a11846ee7e2b928aca629a065a9d876d