Merge branch 'jk/fetch-reflog-df-conflict'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:31 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:32 +0000 (10:52 -0800)
commita1671dd...2b5e1c6e837a3f47509a3a33189b0884
tree7481de8...81bc9b94b6059333009e4c155a75dd99copy hash to clipboard (tree)
parent6b55f8b...4601c6e6319566875b104d333930bc76copy hash to clipboard (diff)
parent9233887...ce8eaebd8469315622b84bd26910351fcopy hash to clipboard (diff)
builtin/fetch.c
refs.c
t/t1410-reflog.sh
t/t5516-fetch-push.sh