{"thread":{"id":"3665","subject":"[PATCH] Rewrite synopsis to clarify the two primary uses of git-checkout.","startedAt":"2006-03-18T00:26:01Z","lastAt":"2006-03-18T07:11:08Z","messageCount":2,"participants":["Jon Loeliger","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17633","messageId":"E1FKPGb-00062a-QC@jdl.com","threadId":"3665","inReplyTo":null,"subject":"[PATCH] Rewrite synopsis to clarify the two primary uses of git-checkout.","fromName":"Jon Loeliger","fromEmail":"jdl@jdl.com","sentAt":"2006-03-18T00:26:01Z","receivedAt":"2006-03-18T00:26:01Z","isPatch":true,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\nFix a few typo/grammar problems.\n\nSigned-off-by: Jon Loeliger <jdl@jdl.com>\n\n\n---\n\n Documentation/git-checkout.txt |   23 +++++++++++++----------\n 1 files changed, 13 insertions(+), 10 deletions(-)\n\n3a8c8dc1832fcffe58cdc4894959f67d91c6a924\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 556e733..dc821bb 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -7,15 +7,18 @@ git-checkout - Checkout and switch to a \n \n SYNOPSIS\n --------\n-'git-checkout' [-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]\n+[verse]\n+'git-checkout' [-f] [-b <new_branch>] [-m] [<branch>]\n+'git-checkout' [-m] [<branch>] <paths>...\n \n DESCRIPTION\n -----------\n \n-When <paths> are not given, this command switches branches, by\n+When <paths> are not given, this command switches branches by\n updating the index and working tree to reflect the specified\n branch, <branch>, and updating HEAD to be <branch> or, if\n-specified, <new_branch>.\n+specified, <new_branch>.  Using -b will cause <new_branch> to\n+be created.\n \n When <paths> are given, this command does *not* switch\n branches.  It updates the named paths in the working tree from\n@@ -29,17 +32,17 @@ given paths before updating the working \n OPTIONS\n -------\n -f::\n-\tForce an re-read of everything.\n+\tForce a re-read of everything.\n \n -b::\n \tCreate a new branch and start it at <branch>.\n \n -m::\n-\tIf you have local modifications to a file that is\n-\tdifferent between the current branch and the branch you\n-\tare switching to, the command refuses to switch\n-\tbranches, to preserve your modifications in context.\n-\tWith this option, a three-way merge between the current\n+\tIf you have local modifications to one or more files that \n+\tare different between the current branch and the branch to\n+\twhich you are switching, the command refuses to switch\n+\tbranches in order to preserve your modifications in context.\n+\tHowever, with this option, a three-way merge between the current\n \tbranch, your working tree contents, and the new branch\n \tis done, and you will be on the new branch.\n +\n@@ -82,7 +85,7 @@ $ git checkout -- hello.c\n ------------\n \n . After working in a wrong branch, switching to the correct\n-branch you would want to is done with:\n+branch would be done using:\n +\n ------------\n $ git checkout mytopic\n-- \n1.2.4.gdd7be\n"},{"id":"17640","messageId":"7v7j6sz0qb.fsf@assigned-by-dhcp.cox.net","threadId":"3665","inReplyTo":"E1FKPGb-00062a-QC@jdl.com","subject":"Re: [PATCH] Rewrite synopsis to clarify the two primary uses of git-checkout.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-18T07:11:08Z","receivedAt":"2006-03-18T07:11:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"All 7 look good.  Thanks.\n"}]}