Skip to content

Commit 783b829

Browse files
avargitster
authored andcommitted
ref-filter: reflow recently changed branch/tag/for-each-ref docs
Reflow the recently changed branch/tag-for-each-ref documentation. This change shows no changes under --word-diff, except the innocuous change of moving git-tag.txt's "[--sort=<key>]" around slightly. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ac3f5a3 commit 783b829

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Documentation/git-branch.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ SYNOPSIS
1010
[verse]
1111
'git branch' [--color[=<when>] | --no-color] [-r | -a]
1212
[--list] [-v [--abbrev=<length> | --no-abbrev]]
13-
[--column[=<options>] | --no-column]
13+
[--column[=<options>] | --no-column] [--sort=<key>]
1414
[(--merged | --no-merged) [<commit>]]
15-
[--contains [<commit]] [--no-contains [<commit>]] [--sort=<key>]
15+
[--contains [<commit]] [--no-contains [<commit>]]
1616
[--points-at <object>] [--format=<format>] [<pattern>...]
1717
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
1818
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
@@ -36,11 +36,12 @@ as branch creation.
3636

3737
With `--contains`, shows only the branches that contain the named commit
3838
(in other words, the branches whose tip commits are descendants of the
39-
named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named
40-
commit (i.e. the branches whose tip commits are reachable from the named
41-
commit) will be listed. With `--no-merged` only branches not merged into
42-
the named commit will be listed. If the <commit> argument is missing it
43-
defaults to `HEAD` (i.e. the tip of the current branch).
39+
named commit), `--no-contains` inverts it. With `--merged`, only branches
40+
merged into the named commit (i.e. the branches whose tip commits are
41+
reachable from the named commit) will be listed. With `--no-merged` only
42+
branches not merged into the named commit will be listed. If the <commit>
43+
argument is missing it defaults to `HEAD` (i.e. the tip of the current
44+
branch).
4445

4546
The command's second form creates a new branch head named <branchname>
4647
which points to the current `HEAD`, or <start-point> if given.

Documentation/git-tag.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ SYNOPSIS
1212
'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
1313
<tagname> [<commit> | <object>]
1414
'git tag' -d <tagname>...
15-
'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>] [--points-at <object>]
16-
[--column[=<options>] | --no-column] [--create-reflog] [--sort=<key>]
17-
[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]
15+
'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
16+
[--points-at <object>] [--column[=<options>] | --no-column]
17+
[--create-reflog] [--sort=<key>] [--format=<format>]
18+
[--[no-]merged [<commit>]] [<pattern>...]
1819
'git tag' -v [--format=<format>] <tagname>...
1920

2021
DESCRIPTION

0 commit comments

Comments
 (0)