| commit | 07c55c00a56ced7dac32206dbaebbb06bf129a37 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Nov 2013 22:36:59 +0000 (7 14:36 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Nov 2013 22:36:59 +0000 (7 14:36 -0800) | ||
| tree | d50cd317fa00f1e93dc74cf1503df92861f50f80 | treesnapshot (tar.gz zip) |
| parent | 9ad3f74cb6fe840b3bbf8d279443dc09c98400a5 | commitdiff |
| parent | bca39695343ecb113b30c72a3b2e0cb7e73757d8 | commitdiff |
Merge branch 'mm/checkout-auto-track-fix' into maint
"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".
* mm/checkout-auto-track-fix:
checkout: proper error message on 'git checkout foo bar --'
checkout: allow dwim for branch creation for "git checkout $branch --"
"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".
* mm/checkout-auto-track-fix:
checkout: proper error message on 'git checkout foo bar --'
checkout: allow dwim for branch creation for "git checkout $branch --"
| builtin/checkout.c | diff1 | diff2 | blobhistory |
| t/t2024-checkout-dwim.sh | diff1 | diff2 | blobhistory |