Merge branch 'jc/gitignore-precedence'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:17:50 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:17:51 +0000 (13:17 -0700)
commit20cf8b548ebd7d5ec98729b4bb8ae5af435a22ff
tree5744fa6cf8ffa26600bd154c9f0023bcd364bc10
parentd0c692263f453f267ddd82b90b1a2fcff9d45f5f
parent099d2d86a8e17218aca31bf7c4070a820baf4baa
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
dir.c
t/t0008-ignores.sh