granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 6 Nov 2014 18:52:31 +0000 (10:52 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 6 Nov 2014 18:52:32 +0000 (10:52 -0800)
commit	a1671dd82b5e1c6e837a3f47509a3a33189b0884
tree	7481de8581bc9b94b6059333009e4c155a75dd99	tree \| snapshot
parent	6b55f8b54601c6e6319566875b104d333930bc76	commit \| diff
parent	9233887cce8eaebd8469315622b84bd26910351f	commit \| diff

Merge branch 'jk/fetch-reflog-df-conflict'

Corner-case bugfixes for "git fetch" around reflog handling.

* jk/fetch-reflog-df-conflict:
ignore stale directories when checking reflog existence
fetch: load all default config at startup

builtin/fetch.c	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history
t/t1410-reflog.sh	diff1 \|	diff2 \|	blob \| history
t/t5516-fetch-push.sh	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

builtin/fetch.c	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history
t/t1410-reflog.sh	diff1 \|	diff2 \|	blob \| history
t/t5516-fetch-push.sh	diff1 \|	diff2 \|	blob \| history