kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Vincent van Ravesteijn 2012-03-06 10:32:43 +01:00 committed by Junio C Hamano
parent 69f4e08f53
commit 3ea2232d8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git-branch.txt
View File

@ -24,7 +24,7 @@ be highlighted with an asterisk. Option `-r` causes the remote-tracking
branches to be listed, and option `-a` shows both. This list mode is also branches to be listed, and option `-a` shows both. This list mode is also
activated by the `--list` option (see below). activated by the `--list` option (see below).
<pattern> restricts the output to matching branches, the pattern is a shell <pattern> restricts the output to matching branches, the pattern is a shell
wildcard (i.e., matched using fnmatch(3)) wildcard (i.e., matched using fnmatch(3)).
Multiple patterns may be given; if any of them matches, the tag is shown. Multiple patterns may be given; if any of them matches, the tag is shown.


With `--contains`, shows only the branches that contain the named commit 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
overridden by using the `--track` and `--no-track` options, and overridden by using the `--track` and `--no-track` options, and
changed later using `git branch --set-upstream`. changed later using `git branch --set-upstream`.


With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>. With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
If <oldbranch> had a corresponding reflog, it is renamed to match If <oldbranch> had a corresponding reflog, it is renamed to match
<newbranch>, and a reflog entry is created to remember the branch <newbranch>, and a reflog entry is created to remember the branch
renaming. If <newbranch> exists, -M must be used to force the rename 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
specify more than one branch for deletion. If the branch currently specify more than one branch for deletion. If the branch currently
has a reflog then the reflog will also be deleted. has a reflog then the reflog will also be deleted.


Use -r together with -d to delete remote-tracking branches. Note, that it Use `-r` together with `-d` to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist only makes sense to delete remote-tracking branches if they no longer exist
in the remote repository or if 'git fetch' was configured not to fetch in the remote repository or if 'git fetch' was configured not to fetch
them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a 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.
branch.autosetupmerge configuration variable is true. branch.autosetupmerge configuration variable is true.


--set-upstream:: --set-upstream::
If specified branch does not exist yet or if '--force' has been If specified branch does not exist yet or if `--force` has been
given, acts exactly like '--track'. Otherwise sets up configuration given, acts exactly like `--track`. Otherwise sets up configuration
like '--track' would when creating the branch, except that where like `--track` would when creating the branch, except that where
branch points to is not changed. branch points to is not changed.


--edit-description:: --edit-description::