git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Fri, 5 Jun 2015 19:00:12 +0000 (12:00 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 5 Jun 2015 19:00:13 +0000 (12:00 -0700)
commit	e9f767ecee21af47fa5515ee6f8106d70cabe983
tree	e0bd4999a874729c219b405dad31e4f82454a062	tree \| snapshot
parent	2d8bb4685c4d1e7187f93436fc26ad468a0cf941	commit \| diff
parent	099d2d86a8e17218aca31bf7c4070a820baf4baa	commit \| diff

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

dir.c	diff1 \|	diff2 \|	blob \| history
t/t0008-ignores.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

dir.c	diff1 \|	diff2 \|	blob \| history
t/t0008-ignores.sh	diff1 \|	diff2 \|	blob \| history