From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2015 20:40:59 +0000 (-0800)
Subject: Merge branch 'jc/checkout-local-track-report'
X-Git-Tag: v2.3.0-rc0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da178ac793047c41e4806a3c32fb421992642683;p=git

Merge branch 'jc/checkout-local-track-report'

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
---

da178ac793047c41e4806a3c32fb421992642683