]> rtime.felk.cvut.cz Git - git.git/commit
projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5b9256 05e7368)
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)
commitda178ac793047c41e4806a3c32fb421992642683
tree65b6053da74fc52bccd25efe3687b71c3af57dd4tree | snapshot
parentc5b9256360b06efb9453c1627b78b14598e288b8commit | diff
parent05e73682cd28eeaf6d949badefd85b94244fca3fcommit | diff
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
remote.c diff1 | diff2 | blob | history
Git mirror and local development