Skip to content

Commit e5ac121

Browse files
dmellorgitster
authored andcommitted
Documentation: minor grammatical fixes in git-branch.txt.
Signed-off-by: David J. Mellor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b89510f commit e5ac121

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

Documentation/git-branch.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ SYNOPSIS
1818
DESCRIPTION
1919
-----------
2020

21-
With no arguments, existing branches are listed, the current branch will
21+
With no arguments, existing branches are listed and the current branch will
2222
be highlighted with an asterisk. Option `-r` causes the remote-tracking
2323
branches to be listed, and option `-a` shows both.
2424

25-
With `--contains`, shows only the branches that contains the named commit
26-
(in other words, the branches whose tip commits are descendant of the
25+
With `--contains`, shows only the branches that contain the named commit
26+
(in other words, the branches whose tip commits are descendants of the
2727
named commit). With `--merged`, only branches merged into the named
2828
commit (i.e. the branches whose tip commits are reachable from the named
2929
commit) will be listed. With `--no-merged` only branches not merged into
30-
the named commit will be listed. Missing <commit> argument defaults to
31-
'HEAD' (i.e. the tip of the current branch).
30+
the named commit will be listed. If the <commit> argument is missing it
31+
defaults to 'HEAD' (i.e. the tip of the current branch).
3232

33-
In its second form, a new branch named <branchname> will be created.
33+
In the command's second form, a new branch named <branchname> will be created.
3434
It will start out with a head equal to the one given as <start-point>.
3535
If no <start-point> is given, the branch will be created with a head
3636
equal to that of the currently checked out branch.
@@ -57,9 +57,9 @@ has a reflog then the reflog will also be deleted.
5757

5858
Use -r together with -d to delete remote-tracking branches. Note, that it
5959
only makes sense to delete remote-tracking branches if they no longer exist
60-
in remote repository or if 'git-fetch' was configured not to fetch
61-
them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
62-
clean up all obsolete remote-tracking branches.
60+
in the remote repository or if 'git-fetch' was configured not to fetch
61+
them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a
62+
way to clean up all obsolete remote-tracking branches.
6363

6464

6565
OPTIONS
@@ -83,7 +83,7 @@ OPTIONS
8383
Move/rename a branch and the corresponding reflog.
8484

8585
-M::
86-
Move/rename a branch even if the new branchname already exists.
86+
Move/rename a branch even if the new branch name already exists.
8787

8888
--color::
8989
Color branches to highlight current, local, and remote branches.
@@ -103,17 +103,17 @@ OPTIONS
103103
Show sha1 and commit subject line for each head.
104104

105105
--abbrev=<length>::
106-
Alter minimum display length for sha1 in output listing,
107-
default value is 7.
106+
Alter the sha1's minimum display length in the output listing.
107+
The default value is 7.
108108

109109
--no-abbrev::
110-
Display the full sha1s in output listing rather than abbreviating them.
110+
Display the full sha1s in the output listing rather than abbreviating them.
111111

112112
--track::
113-
When creating a new branch, set up configuration so that 'git-pull'
113+
When creating a new branch, set up the configuration so that 'git-pull'
114114
will automatically retrieve data from the start point, which must be
115115
a branch. Use this if you always pull from the same upstream branch
116-
into the new branch, and if you don't want to use "git pull
116+
into the new branch, and if you do not want to use "git pull
117117
<repository> <refspec>" explicitly. This behavior is the default
118118
when the start point is a remote branch. Set the
119119
branch.autosetupmerge configuration variable to `false` if you want
@@ -149,13 +149,13 @@ OPTIONS
149149

150150
<newbranch>::
151151
The new name for an existing branch. The same restrictions as for
152-
<branchname> applies.
152+
<branchname> apply.
153153

154154

155155
Examples
156156
--------
157157

158-
Start development off of a known tag::
158+
Start development from a known tag::
159159
+
160160
------------
161161
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
@@ -167,7 +167,7 @@ $ git checkout my2.6.14
167167
<1> This step and the next one could be combined into a single step with
168168
"checkout -b my2.6.14 v2.6.14".
169169

170-
Delete unneeded branch::
170+
Delete an unneeded branch::
171171
+
172172
------------
173173
$ git clone git://git.kernel.org/.../git.git my.git
@@ -176,21 +176,21 @@ $ git branch -d -r origin/todo origin/html origin/man <1>
176176
$ git branch -D test <2>
177177
------------
178178
+
179-
<1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or
180-
'pull' will create them again unless you configure them not to. See
181-
linkgit:git-fetch[1].
182-
<2> Delete "test" branch even if the "master" branch (or whichever branch is
183-
currently checked out) does not have all commits from test branch.
179+
<1> Delete the remote-tracking branches "todo", "html" and "man". The next
180+
'fetch' or 'pull' will create them again unless you configure them not to.
181+
See linkgit:git-fetch[1].
182+
<2> Delete the "test" branch even if the "master" branch (or whichever branch
183+
is currently checked out) does not have all commits from the test branch.
184184

185185

186186
Notes
187187
-----
188188

189-
If you are creating a branch that you want to immediately checkout, it's
189+
If you are creating a branch that you want to checkout immediately, it is
190190
easier to use the git checkout command with its `-b` option to create
191191
a branch and check it out with a single command.
192192

193-
The options `--contains`, `--merged` and `--no-merged` serves three related
193+
The options `--contains`, `--merged` and `--no-merged` serve three related
194194
but different purposes:
195195

196196
- `--contains <commit>` is used to find all branches which will need

0 commit comments

Comments
 (0)