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 /resolve-undo.c | |
| parent | Merge branch 'sg/t3600-nul-sha1-fix' (diff) | |
| parent | checkout: proper error message on 'git checkout foo bar --' (diff) | |
| download | tgif-f101b888f278ca6ceaeef11fbee72c29e6dd9237.tar.xz | |
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 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions