From 3ea2232d8d273af2cac9bb57b9af80cfe6fa4b22 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Tue, 6 Mar 2012 10:32:43 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 0427e80a3..d3a923a57 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -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 activated by the `--list` option (see below). 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. 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 changed later using `git branch --set-upstream`. -With a '-m' or '-M' option, will be renamed to . +With a `-m` or `-M` option, will be renamed to . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the rename @@ -59,7 +59,7 @@ With a `-d` or `-D` option, `` will be deleted. You may specify more than one branch for deletion. If the branch currently 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 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 @@ -154,9 +154,9 @@ start-point is either a local or remote-tracking branch. branch.autosetupmerge configuration variable is true. --set-upstream:: - If specified branch does not exist yet or if '--force' has been - given, acts exactly like '--track'. Otherwise sets up configuration - like '--track' would when creating the branch, except that where + If specified branch does not exist yet or if `--force` has been + given, acts exactly like `--track`. Otherwise sets up configuration + like `--track` would when creating the branch, except that where branch points to is not changed. --edit-description:: -- cgit v1.2.1 From ebab98942069400b12aa357c95e3e8f7a4f26bab Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Tue, 6 Mar 2012 10:32:44 +0100 Subject: Documentation/git-branch: fix a typo Fix a typo by replacing 'tag' with 'branch'. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d3a923a57..cfceac56d 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -25,7 +25,7 @@ branches to be listed, and option `-a` shows both. This list mode is also activated by the `--list` option (see below). restricts the output to matching branches, the pattern is a shell 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 branch is shown. With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the -- cgit v1.2.1 From f36ed6db699673bcfb010ab7343bacd5537eb679 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Tue, 6 Mar 2012 10:32:45 +0100 Subject: Documentation/git-branch: add default for --contains Indicate that the commit parameter of --contains defaults to HEAD. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index cfceac56d..6410c3d34 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -163,8 +163,9 @@ start-point is either a local or remote-tracking branch. Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `request-pull`). ---contains :: - Only list branches which contain the specified commit. +--contains []:: + Only list branches which contain the specified commit (HEAD + if not specified). --merged []:: Only list branches whose tips are reachable from the -- cgit v1.2.1