Typo and language fixes for git-checkout.txt
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Mar 10, 2009 at 16:06 UTC
c7cb12b86ca9d0b92fa80045dfa0dd2b64bf71b7
1 file changed
+16
-17
Documentation/git-checkout.txt
+16
-17
@@ -8,7 +8,7 @@ git-checkout - Checkout a branch or paths to the working tree
8
SYNOPSIS
9
--------
10
[verse]
11
-'git checkout' [-q] [-f] [--track | --no-track] [-b <new_branch> [-l]] [-m] [<branch>]
11
+'git checkout' [-q] [-f] [-t | --track | --no-track] [-b <new_branch> [-l]] [-m] [<branch>]
12
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
13
14
DESCRIPTION
@@ -21,15 +21,15 @@ specified, <new_branch>. Using -b will cause <new_branch> to
21
be created; in this case you can use the --track or --no-track
22
options, which will be passed to `git branch`.
23
24
-As a convenience, --track will default to create a branch whose
24
+As a convenience, --track will default to creating a branch whose
25
name is constructed from the specified branch name by stripping
26
the first namespace level.
27
28
When <paths> are given, this command does *not* switch
29
branches. It updates the named paths in the working tree from
30
the index file, or from a named <tree-ish> (most often a commit). In
31
-this case, the `-b` options is meaningless and giving
32
-either of them results in an error. <tree-ish> argument can be
31
+this case, the `-b` and `--track` options are meaningless and giving
32
+either of them results in an error. The <tree-ish> argument can be
33
used to specify a specific tree-ish (i.e. commit, tag or tree)
34
to update the index for the given paths before updating the
35
working tree.
@@ -75,14 +75,13 @@ entries; instead, unmerged entries are ignored.
75
<repository> <refspec>" explicitly. This behavior is the default
76
when the start point is a remote branch. Set the
77
branch.autosetupmerge configuration variable to `false` if you want
78
- 'git-checkout' and 'git-branch' to always behave as if '--no-track' were
78
+ 'git checkout' and 'git branch' to always behave as if '--no-track' were
79
given. Set it to `always` if you want this behavior when the
80
- start-point is either a local or remote branch.
80
+ start point is either a local or remote branch.
81
+
82
-If no '-b' option was given, the name of the new branch will be
83
-derived from the remote branch, by attempting to guess the name
84
-of the branch on remote system. If "remotes/" or "refs/remotes/"
85
-are prefixed, it is stripped away, and then the part up to the
82
+If no '-b' option is given, the name of the new branch will be
83
+derived from the remote branch. If "remotes/" or "refs/remotes/"
84
+is prefixed it is stripped away, and then the part up to the
85
next slash (which would be the nickname of the remote) is removed.
86
This would tell us to use "hack" as the local branch when branching
87
off of "origin/hack" (or "remotes/origin/hack", or even
@@ -152,12 +151,12 @@ $ git checkout v2.6.18
151
------------
152
153
Earlier versions of git did not allow this and asked you to
155
-create a temporary branch using `-b` option, but starting from
154
+create a temporary branch using the `-b` option, but starting from
155
version 1.5.0, the above command 'detaches' your HEAD from the
157
-current branch and directly point at the commit named by the tag
158
-(`v2.6.18` in the above example).
156
+current branch and directly points at the commit named by the tag
157
+(`v2.6.18` in the example above).
158
160
-You can use usual git commands while in this state. You can use
159
+You can use all git commands while in this state. You can use
160
`git reset --hard $othercommit` to further move around, for
161
example. You can make changes and create a new commit on top of
162
a detached HEAD. You can even create a merge by using `git
@@ -191,7 +190,7 @@ $ git checkout hello.c <3>
190
------------
191
+
192
<1> switch branch
194
-<2> take out a file out of other commit
193
+<2> take a file out of another commit
194
<3> restore hello.c from HEAD of current branch
195
+
196
If you have an unfortunate branch that is named `hello.c`, this
@@ -202,7 +201,7 @@ You should instead write:
201
$ git checkout -- hello.c
202
------------
203
205
-. After working in a wrong branch, switching to the correct
204
+. After working in the wrong branch, switching to the correct
205
branch would be done using:
206
+
207
------------
@@ -210,7 +209,7 @@ $ git checkout mytopic
209
------------
210
+
211
However, your "wrong" branch and correct "mytopic" branch may
213
-differ in files that you have locally modified, in which case,
212
+differ in files that you have modified locally, in which case
213
the above checkout would fail like this:
214
+
215
------------