Merge branch 'jc/maint-1.7.3-checkout-describe' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 21:43:18 +0000 (14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 21:43:18 +0000 (14:43 -0700)
commit055f2c5d340508d3542ede8dc1db2aedd0b9f1b5
tree7d33f7fc50749cb7acd5a3f25d281ffdf760e88b
parente08afecd7fe04b519b72f136c4a24b151c748f49
parentc17b229454ac3f5d20fd0cff3a663b03c13cb38e
Merge branch 'jc/maint-1.7.3-checkout-describe' into maint

* jc/maint-1.7.3-checkout-describe:
  checkout -b <name>: correctly detect existing branch
builtin/checkout.c
refs.c
refs.h
t/t2018-checkout-branch.sh