From: Jeff King Date: Mon, 13 Apr 2009 11:19:33 +0000 (-0400) Subject: doc/checkout: split checkout and branch creation in synopsis X-Git-Tag: v1.6.3-rc1~6^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/76cfadfc17e9e9c7da87a6f9a4710c04107ae0cd?hp=--cc doc/checkout: split checkout and branch creation in synopsis These can really be thought of as two different modes, since the "" parameter is treated differently in the two (in one it is the branch to be checked out, but in the other it is really a start-point for branch creation). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- 76cfadfc17e9e9c7da87a6f9a4710c04107ae0cd diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 22ad10d952..4a1fb53096 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -8,23 +8,22 @@ git-checkout - Checkout a branch or paths to the working tree SYNOPSIS -------- [verse] -'git checkout' [-q] [-f] [-m] [-b ] [] +'git checkout' [-q] [-f] [-m] [] +'git checkout' [-q] [-f] [-m] [-b ] [] 'git checkout' [-f|--ours|--theirs|-m|--conflict=