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

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>
maint
Ævar Arnfjörð Bjarmason 2017-03-24 18:40:58 +00:00 committed by Junio C Hamano
parent ac3f5a3468
commit 783b829287
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/git-branch.txt
View File

@ -10,9 +10,9 @@ SYNOPSIS
[verse] [verse]
'git branch' [--color[=<when>] | --no-color] [-r | -a] 'git branch' [--color[=<when>] | --no-color] [-r | -a]
[--list] [-v [--abbrev=<length> | --no-abbrev]] [--list] [-v [--abbrev=<length> | --no-abbrev]]
[--column[=<options>] | --no-column] [--column[=<options>] | --no-column] [--sort=<key>]
[(--merged | --no-merged) [<commit>]] [(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]] [--sort=<key>] [--contains [<commit]] [--no-contains [<commit>]]
[--points-at <object>] [--format=<format>] [<pattern>...] [--points-at <object>] [--format=<format>] [<pattern>...]
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] 'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
@ -36,11 +36,12 @@ as branch creation.


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


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

7
Documentation/git-tag.txt
View File

@ -12,9 +12,10 @@ SYNOPSIS
'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>] 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
<tagname> [<commit> | <object>] <tagname> [<commit> | <object>]
'git tag' -d <tagname>... 'git tag' -d <tagname>...
'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>] [--points-at <object>] 'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
[--column[=<options>] | --no-column] [--create-reflog] [--sort=<key>] [--points-at <object>] [--column[=<options>] | --no-column]
[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...] [--create-reflog] [--sort=<key>] [--format=<format>]
[--[no-]merged [<commit>]] [<pattern>...]
'git tag' -v [--format=<format>] <tagname>... 'git tag' -v [--format=<format>] <tagname>...


DESCRIPTION DESCRIPTION