summaryrefslogtreecommitdiff
path: root/contrib/completion/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-05-19 08:59:15 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-24 10:59:27 +0900
commit158b06caee5f9ea2987f444b8e49bd2d678b187d (patch)
treec7038b47c4392461e760b97f0d4ef0d9a766f073 /contrib/completion/.gitattributes
parentdiff: use the word "path" instead of "name" for blobs (diff)
downloadtgif-158b06caee5f9ea2987f444b8e49bd2d678b187d.tar.xz
diff: use pending "path" if it is available
There's a subtle distinction between "name" and "path" for a blob that we resolve: the name is what the user told us on the command line, and the path is what we traversed when finding the blob within a tree (if we did so). When we diff blobs directly, we use "name", but "path" is more likely to be useful to the user (it will find the correct .gitattributes, and give them a saner diff header). We still have to fall back to using the name for some cases (i.e., any blob reference that isn't of the form tree:path). That's the best we can do in such a case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion/.gitattributes')
0 files changed, 0 insertions, 0 deletions