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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 24, 2017 at 18:40 UTC
783b829287952ec42bf89d9ca42fc6c51d7d0143
2 files changed
+12
-10
Documentation/git-branch.txt
+8
-7
@@ -10,9 +10,9 @@ SYNOPSIS
10
[verse]
11
'git branch' [--color[=<when>] | --no-color] [-r | -a]
12
[--list] [-v [--abbrev=<length> | --no-abbrev]]
13
- [--column[=<options>] | --no-column]
13
+ [--column[=<options>] | --no-column] [--sort=<key>]
14
[(--merged | --no-merged) [<commit>]]
15
- [--contains [<commit]] [--no-contains [<commit>]] [--sort=<key>]
15
+ [--contains [<commit]] [--no-contains [<commit>]]
16
[--points-at <object>] [--format=<format>] [<pattern>...]
17
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
18
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
@@ -36,11 +36,12 @@ as branch creation.
36
37
With `--contains`, shows only the branches that contain the named commit
38
(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).
45
46
The command's second form creates a new branch head named <branchname>
47
which points to the current `HEAD`, or <start-point> if given.
Documentation/git-tag.txt
+4
-3
@@ -12,9 +12,10 @@ SYNOPSIS
12
'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
13
<tagname> [<commit> | <object>]
14
'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>...]
19
'git tag' -v [--format=<format>] <tagname>...
20
21
DESCRIPTION