Merge branch 'jc/checkout-local-track-report'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:40:59 +0000 (12:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 20:41:00 +0000 (12:41 -0800)
The report from "git checkout" on a branch that builds on another
local branch by setting its branch.*.merge to branch name (not a
full refname) incorrectly said that the upstream is gone.

* jc/checkout-local-track-report:
checkout: report upstream correctly even with loosely defined branch.*.merge

1  2 
remote.c
diff --cc remote.c
Simple merge