Merge branch 'uk/checkout-ambiguous-ref'
commitc0791f365e8024c35321a2c53856c3c63cd54299
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:29 +0000 (27 21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:29 +0000 (27 21:58 -0800)
treeb1361cb583ca1d425dc30f67342996d06e6aa84b
parent28afcbfe8b0a938e9fd009f11e7fa1486e394002
parent6c74ce8c7db669f896a04a2743c09abaa6053173
Merge branch 'uk/checkout-ambiguous-ref'

* 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
  checkout: fix bug with ambiguous refs

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