diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:40:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:41:00 -0800 |
| commit | da178ac793047c41e4806a3c32fb421992642683 (patch) | |
| tree | 65b6053da74fc52bccd25efe3687b71c3af57dd4 /mergetools/tortoisemerge | |
| parent | Merge branch 'for-junio' of git://bogomips.org/git-svn (diff) | |
| parent | checkout: report upstream correctly even with loosely defined branch.*.merge (diff) | |
| download | tgif-da178ac793047c41e4806a3c32fb421992642683.tar.xz | |
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
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions