Merge branch 'uk/checkout-ambiguous-ref' into next
commit645dad610a3942e562600b3b4edd70f355a5840e
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 19:24:51 +0000 (15 11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 19:24:51 +0000 (15 11:24 -0800)
tree5a432c0b10d8369ad833e8cd1c2060db1e2224a1
parent9a18caa0f8453cfb64b620a9282f3e84767848f2
parent6c74ce8c7db669f896a04a2743c09abaa6053173
Merge branch 'uk/checkout-ambiguous-ref' into next

* uk/checkout-ambiguous-ref:
  Rename t2019 with typo "amiguous" that meant "ambiguous"
  checkout: rearrange update_refs_for_switch for clarity
  checkout: introduce --detach synonym for "git checkout foo^{commit}"
  checkout: split off a function to peel away branchname arg

Conflicts:
builtin/checkout.c
Documentation/git-checkout.txt
builtin/checkout.c