Autogenerated man pages for v1.2.4-g5a1f

[git.git] / man1 / git-checkout.1

diff --git a/man1/git-checkout.1 b/man1/git-checkout.1
index c623694..7e37356 100755 (executable)
--- a/man1/git-checkout.1
+++ b/man1/git-checkout.1
@@ -22,13 +22,15 @@
 git-checkout \- Checkout and switch to a branch
 .SH "SYNOPSIS"
 
-
-\fIgit\-checkout\fR [\-f] [\-b <new_branch>] [\-m] [<branch>] [<paths>...]
+.nf
+\fIgit\-checkout\fR [\-f] [\-b <new_branch>] [\-m] [<branch>]
+\fIgit\-checkout\fR [\-m] [<branch>] <paths>...
+.fi
 
 .SH "DESCRIPTION"
 
 
-When <paths> are not given, this command switches branches, by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>\&.
+When <paths> are not given, this command switches branches by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>\&. Using \-b will cause <new_branch> to be created\&.
 
 
 When <paths> are given, this command does \fInot\fR switch branches\&. It updates the named paths in the working tree from the index file (i\&.e\&. it runs git\-checkout\-index \-f \-u)\&. In this case, \-f and \-b options are meaningless and giving either of them results in an error\&. <branch> argument can be used to specify a specific tree\-ish to update the index for the given paths before updating the working tree\&.
@@ -37,7 +39,7 @@ When <paths> are given, this command does \fInot\fR switch branches\&. It update
 
 .TP
 \-f
-Force an re\-read of everything\&.
+Force a re\-read of everything\&.
 
 .TP
 \-b
@@ -45,7 +47,7 @@ Create a new branch and start it at <branch>\&.
 
 .TP
 \-m
-If you have local modifications to a file that is different between the current branch and the branch you are switching to, the command refuses to switch branches, to preserve your modifications in context\&. With this option, a three\-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch\&.
+If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context\&. However, with this option, a three\-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch\&.
 
 When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with git update\-index\&.
 
@@ -81,7 +83,7 @@ $ git checkout \-\- hello\&.c
 .fi
 .TP
 2.
-After working in a wrong branch, switching to the correct branch you would want to is done with:
+After working in a wrong branch, switching to the correct branch would be done using:
 
 
 .nf