mirror of
https://github.com/git/git
synced 2024-10-29 06:06:41 +00:00
Merge branch 'maint'
* maint: Documentation: Reformatted SYNOPSIS for several commands Documentation: Added [verse] to SYNOPSIS where necessary
This commit is contained in:
commit
404fdef22f
11 changed files with 24 additions and 10 deletions
|
@ -8,6 +8,7 @@ git-archive - Creates an archive of files from a named tree
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
|
'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
|
||||||
[--remote=<repo>] <tree-ish> [path...]
|
[--remote=<repo>] <tree-ish> [path...]
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ git-bundle - Move objects and refs by archive
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
'git-bundle' create <file> [git-rev-list args]
|
'git-bundle' create <file> [git-rev-list args]
|
||||||
'git-bundle' verify <file>
|
'git-bundle' verify <file>
|
||||||
'git-bundle' list-heads <file> [refname...]
|
'git-bundle' list-heads <file> [refname...]
|
||||||
|
|
|
@ -8,6 +8,7 @@ git-fmt-merge-msg - Produce a merge commit message
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
|
git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
|
||||||
git-fmt-merge-msg [--summary | --no-summray] -F <file>
|
git-fmt-merge-msg [--summary | --no-summray] -F <file>
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,10 @@ git-for-each-ref - Output information on each ref
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-for-each-ref' [--count=<count>]\* [--shell|--perl|--python|--tcl] [--sort=<key>]\* [--format=<format>] [<pattern>]
|
[verse]
|
||||||
|
'git-for-each-ref' [--count=<count>]\*
|
||||||
|
[--shell|--perl|--python|--tcl]
|
||||||
|
[--sort=<key>]\* [--format=<format>] [<pattern>]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -8,8 +8,10 @@ git-index-pack - Build pack index file for an existing packed archive
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
'git-index-pack' [-v] [-o <index-file>] <pack-file>
|
'git-index-pack' [-v] [-o <index-file>] <pack-file>
|
||||||
'git-index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>] [<pack-file>]
|
'git-index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
|
||||||
|
[<pack-file>]
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
|
|
@ -7,8 +7,9 @@ git-instaweb - Instantly browse your working repository in gitweb
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-instaweb' [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]
|
[verse]
|
||||||
|
'git-instaweb' [--local] [--httpd=<httpd>] [--port=<port>]
|
||||||
|
[--browser=<browser>]
|
||||||
'git-instaweb' [--start] [--stop] [--restart]
|
'git-instaweb' [--start] [--stop] [--restart]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
|
|
@ -8,7 +8,9 @@ git-local-fetch - Duplicate another git repository on a local system
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path
|
[verse]
|
||||||
|
'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n]
|
||||||
|
commit-id path
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -8,6 +8,7 @@ git-name-rev - Find symbolic names for given revs
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
'git-name-rev' [--tags] [--refs=<pattern>]
|
'git-name-rev' [--tags] [--refs=<pattern>]
|
||||||
( --all | --stdin | <committish>... )
|
( --all | --stdin | <committish>... )
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,10 @@ git-p4import - Import a Perforce repository into git
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
`git-p4import` [-q|-v] [--notags] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>
|
[verse]
|
||||||
|
`git-p4import` [-q|-v] [--notags] [--authors <file>] [-t <timezone>]
|
||||||
|
<//p4repo/path> <branch>
|
||||||
`git-p4import` --stitch <//p4repo/path>
|
`git-p4import` --stitch <//p4repo/path>
|
||||||
|
|
||||||
`git-p4import`
|
`git-p4import`
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,9 @@ git-push - Update remote refs along with associated objects
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
'git-push' [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]
|
[verse]
|
||||||
|
'git-push' [--all] [--tags] [--receive-pack=<git-receive-pack>]
|
||||||
|
[--repo=all] [-f | --force] [-v] [<repository> <refspec>...]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -7,8 +7,8 @@ git-rebase - Forward-port local commits to the updated upstream head
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
|
[verse]
|
||||||
'git-rebase' [-v] [--merge] [-C<n>] [--onto <newbase>] <upstream> [<branch>]
|
'git-rebase' [-v] [--merge] [-C<n>] [--onto <newbase>] <upstream> [<branch>]
|
||||||
|
|
||||||
'git-rebase' --continue | --skip | --abort
|
'git-rebase' --continue | --skip | --abort
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
|
Loading…
Reference in a new issue