summaryrefslogtreecommitdiff
path: root/t/lib-gpg/trustdb.gpg
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:51 -0700
commit20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff (patch)
tree5744fa6cf8ffa26600bd154c9f0023bcd364bc10 /t/lib-gpg/trustdb.gpg
parentMerge branch 'nd/diff-i-t-a' (diff)
parentignore: info/exclude should trump core.excludesfile (diff)
downloadtgif-20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff.tar.xz
Merge branch 'jc/gitignore-precedence'
core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed to be overridden by repository-specific .git/info/exclude file, but the order was swapped from the beginning. This belatedly fixes it. * jc/gitignore-precedence: ignore: info/exclude should trump core.excludesfile
Diffstat (limited to 't/lib-gpg/trustdb.gpg')
0 files changed, 0 insertions, 0 deletions