| commit | 76407ef93bf6f1a1e73a3da712eaa276c710249f | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Fri, 29 Jun 2012 21:31:14 +0000 (29 23:31 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Fri, 29 Jun 2012 21:37:36 +0000 (29 23:37 +0200) | ||
| tree | c754ebf54eb2b622e01026791e4759a807632fd0 | treesnapshot (tar.gz zip) |
| parent | 6e6976fef4130489d558e3583f842a52a9c779bb | commitdiff |
Fixed issue #913: Merge does not cope with ambiguous tag and branch names
Checkout is unlike regular ref lookup in that it prefers branches to
other forms (because it is fundamentally a branch operation). So "git
checkout foo" should always choose "refs/heads/foo".
See http://git.661346.n2.nabble.com/howto-handle-name-clashes-td7398543.html
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Checkout is unlike regular ref lookup in that it prefers branches to
other forms (because it is fundamentally a branch operation). So "git
checkout foo" should always choose "refs/heads/foo".
See http://git.661346.n2.nabble.com/howto-handle-name-clashes-td7398543.html
Signed-off-by: Sven Strickroth <email@cs-ware.de>