diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:16 -0700 |
commit | f101b888f278ca6ceaeef11fbee72c29e6dd9237 (patch) | |
tree | 196085a6cf8c9c2ef0d9cb347b95ff25e9c3b49a /builtin/merge-index.c | |
parent | 504c1942a9b9dc6dd440bd18730f55e947dd9ce1 (diff) | |
parent | bca39695343ecb113b30c72a3b2e0cb7e73757d8 (diff) | |
download | git-f101b888f278ca6ceaeef11fbee72c29e6dd9237.tar.gz |
Merge branch 'mm/checkout-auto-track-fix'
"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 --"
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions