From: Junio C Hamano Date: Wed, 18 Aug 2010 18:42:47 +0000 (-0700) Subject: Merge branch 'tc/checkout-B' X-Git-Tag: v1.7.3-rc0~79 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07cd900112b19657531a1f5c2a15e639d98fbd18?hp=-c Merge branch 'tc/checkout-B' * tc/checkout-B: builtin/checkout: handle -B from detached HEAD correctly builtin/checkout: learn -B builtin/checkout: reword hint for -b add tests for checkout -b --- 07cd900112b19657531a1f5c2a15e639d98fbd18 diff --combined Documentation/git-checkout.txt index 1bacd2e104,97c51449f7..66e570113a --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@@ -9,7 -9,7 +9,7 @@@ SYNOPSI -------- [verse] 'git checkout' [-q] [-f] [-m] [] - 'git checkout' [-q] [-f] [-m] [[-b|--orphan] ] [] + 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] ] [] 'git checkout' [-f|--ours|--theirs|-m|--conflict=