Documentation/git-branch: cleanups
Most of the exact option strings to be typed by end users are already set in typewriter font by using `--option`, but a few places used '--option' to call for italics or with no quoting. Uniformly use `--option`. Also add a full-stop after a sentence that missed one. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vincent van Ravesteijn committed
Mar 6, 2012 at 10:32 UTC
3ea2232d8d273af2cac9bb57b9af80cfe6fa4b22
1 file changed
+6
-6
Documentation/git-branch.txt
+6
-6
@@ -24,7 +24,7 @@ be highlighted with an asterisk. Option `-r` causes the remote-tracking
24
branches to be listed, and option `-a` shows both. This list mode is also
25
activated by the `--list` option (see below).
26
<pattern> restricts the output to matching branches, the pattern is a shell
27
-wildcard (i.e., matched using fnmatch(3))
27
+wildcard (i.e., matched using fnmatch(3)).
28
Multiple patterns may be given; if any of them matches, the tag is shown.
29
30
With `--contains`, shows only the branches that contain the named commit
@@ -49,7 +49,7 @@ the remote-tracking branch. This behavior may be changed via the global
49
overridden by using the `--track` and `--no-track` options, and
50
changed later using `git branch --set-upstream`.
51
52
-With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
52
+With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
53
If <oldbranch> had a corresponding reflog, it is renamed to match
54
<newbranch>, and a reflog entry is created to remember the branch
55
renaming. If <newbranch> exists, -M must be used to force the rename
@@ -59,7 +59,7 @@ With a `-d` or `-D` option, `<branchname>` will be deleted. You may
59
specify more than one branch for deletion. If the branch currently
60
has a reflog then the reflog will also be deleted.
61
62
-Use -r together with -d to delete remote-tracking branches. Note, that it
62
+Use `-r` together with `-d` to delete remote-tracking branches. Note, that it
63
only makes sense to delete remote-tracking branches if they no longer exist
64
in the remote repository or if 'git fetch' was configured not to fetch
65
them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a
@@ -154,9 +154,9 @@ start-point is either a local or remote-tracking branch.
154
branch.autosetupmerge configuration variable is true.
155
156
--set-upstream::
157
- If specified branch does not exist yet or if '--force' has been
158
- given, acts exactly like '--track'. Otherwise sets up configuration
159
- like '--track' would when creating the branch, except that where
157
+ If specified branch does not exist yet or if `--force` has been
158
+ given, acts exactly like `--track`. Otherwise sets up configuration
159
+ like `--track` would when creating the branch, except that where
160
branch points to is not changed.
161
162
--edit-description::