Skip to content

Commit 0f45b5b

Browse files
committed
show-branch doc: say <ref>, not <reference>
The glossary defines 'ref' as the official name of the thing, and the output from "git grep -e '<ref' Documentation/" shows that most everybody uses <ref>, not <reference>. In addition, the page already says <ref> in its SYNOPSIS section for the command when it is used in the mode to follow the reflogs. Strictly speaking, many references of these should be updated to <commit> after adding an explanation on how these <commit>s are discovered (i.e. we take <rev>, <glob>, or <ref> and starting from these commits, follow their ancestry or reflog entries to list commits), but that would be a lot bigger change I would rather not to do in this patch, whose primary purpose is to make the existing documentation more consistent. Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Sean Allred <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 00bf685 commit 0f45b5b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/git-show-branch.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ OPTIONS
7474
that is the common ancestor of all the branches. This
7575
flag tells the command to go <n> more common commits
7676
beyond that. When <n> is negative, display only the
77-
<reference>s given, without showing the commit ancestry
78-
tree.
77+
<ref>s given, without showing the commit ancestry tree.
7978

8079
--list::
8180
Synonym to `--more=-1`
@@ -88,8 +87,8 @@ OPTIONS
8887
the case of three or more commits.
8988

9089
--independent::
91-
Among the <reference>s given, display only the ones that
92-
cannot be reached from any other <reference>.
90+
Among the <ref>s given, display only the ones that cannot be
91+
reached from any other <ref>.
9392

9493
--no-name::
9594
Do not show naming strings for each commit.
@@ -132,10 +131,11 @@ are mutually exclusive.
132131

133132
OUTPUT
134133
------
135-
Given N <references>, the first N lines are the one-line
136-
description from their commit message. The branch head that is
137-
pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*`
138-
character while other heads are prefixed with a `!` character.
134+
135+
Given N <ref>s, the first N lines are the one-line description from
136+
their commit message. The branch head that is pointed at by
137+
$GIT_DIR/HEAD is prefixed with an asterisk `*` character while other
138+
heads are prefixed with a `!` character.
139139

140140
Following these N lines, one-line log for each commit is
141141
displayed, indented N places. If a commit is on the I-th

0 commit comments

Comments
 (0)