From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Feb 2019 15:18:00 +0000 (-0800)
Subject: Merge branch 'yn/checkout-doc-fix'
X-Git-Tag: v2.21.0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/572e460b7a5f09bc5cec446b852cb57261b8563b?ds=inline;hp=-c

Merge branch 'yn/checkout-doc-fix'

Doc fix.

* yn/checkout-doc-fix:
checkout doc: fix an unmatched double-quote pair
---

572e460b7a5f09bc5cec446b852cb57261b8563b
diff --combined Documentation/git-checkout.txt
index 9a396498d1,55eb39a897..8c3d4128c2
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@@ -276,10 -276,6 +276,10 @@@ section of linkgit:git-add[1] to learn 
  	Just like linkgit:git-submodule[1], this will detach the
  	submodules HEAD.
  
 +--no-guess::
 +	Do not attempt to create a branch if a remote tracking branch
 +	of the same name exists.
 +
  <branch>::
  	Branch to checkout; if it refers to a branch (i.e., a name that,
  	when prepended with "refs/heads/", is a valid ref), then that
@@@ -289,7 -285,7 +289,7 @@@
  +
  You can use the `"@{-N}"` syntax to refer to the N-th last
  branch/commit checked out using "git checkout" operation. You may
- also specify `-` which is synonymous to `"@{-1}`.
+ also specify `-` which is synonymous to `"@{-1}"`.
  +
  As a special case, you may use `"A...B"` as a shortcut for the
  merge base of `A` and `B` if there is exactly one merge base. You can
@@@ -424,14 -420,14 +424,14 @@@ $ git tag foo           <3
  ------------
  
  <1> creates a new branch 'foo', which refers to commit 'f', and then
 -updates HEAD to refer to branch 'foo'. In other words, we'll no longer
 -be in detached HEAD state after this command.
 +    updates HEAD to refer to branch 'foo'. In other words, we'll no longer
 +    be in detached HEAD state after this command.
  
  <2> similarly creates a new branch 'foo', which refers to commit 'f',
 -but leaves HEAD detached.
 +    but leaves HEAD detached.
  
  <3> creates a new tag 'foo', which refers to commit 'f',
 -leaving HEAD detached.
 +    leaving HEAD detached.
  
  If we have moved away from commit 'f', then we must first recover its object
  name (typically by using git reflog), and then we can create a reference to
@@@ -459,8 -455,8 +459,8 @@@ EXAMPLE
  --------
  
  . The following sequence checks out the `master` branch, reverts
 -the `Makefile` to two revisions back, deletes hello.c by
 -mistake, and gets it back from the index.
 +  the `Makefile` to two revisions back, deletes hello.c by
 +  mistake, and gets it back from the index.
  +
  ------------
  $ git checkout master             <1>
@@@ -494,7 -490,7 +494,7 @@@ $ git checkout -- hello.
  ------------
  
  . After working in the wrong branch, switching to the correct
 -branch would be done using:
 +  branch would be done using:
  +
  ------------
  $ git checkout mytopic
@@@ -522,7 -518,7 +522,7 @@@ registered in your index file, so `git 
  changes you made since the tip of the new branch.
  
  . When a merge conflict happens during switching branches with
 -the `-m` option, you would see something like this:
 +  the `-m` option, you would see something like this:
  +
  ------------
  $ git checkout -m mytopic