diff options
author | 2015-06-05 12:00:12 -0700 | |
---|---|---|
committer | 2015-06-05 12:00:13 -0700 | |
commit | e9f767ecee21af47fa5515ee6f8106d70cabe983 (patch) | |
tree | e0bd4999a874729c219b405dad31e4f82454a062 /builtin/send-pack.c | |
parent | Merge branch 'bc/connect-plink' into maint (diff) | |
parent | ignore: info/exclude should trump core.excludesfile (diff) | |
download | tgif-e9f767ecee21af47fa5515ee6f8106d70cabe983.tar.xz |
Merge branch 'jc/gitignore-precedence' into maint
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 'builtin/send-pack.c')
0 files changed, 0 insertions, 0 deletions