diff options
author | Jeff King <peff@peff.net> | 2015-12-01 17:21:17 -0500 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2015-12-01 17:21:17 -0500 |
commit | 978b5760a11846ee7e2b928aca629a065a9d876d (patch) | |
tree | beb3e3a37ea7b596f184b18f108e0df6f0fc50bb /commit.h | |
parent | 2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4 (diff) | |
parent | 4d2a3646d1f0285ce072cdfe34a7df64710f9357 (diff) | |
download | git-978b5760a11846ee7e2b928aca629a065a9d876d.tar.gz |
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
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions