diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-19 08:50:56 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-19 08:50:56 +0400 |
commit | 404fdef22f1084141aeef5781d5a322554fed481 (patch) | |
tree | abfce65899ec3856f636d9ff5465a8d962296398 /Documentation | |
parent | 2ff3f61ab6125edc53e4da8065b787bd10d0fdbb (diff) | |
parent | 97925fde00743e557fa5e792004483a27e31fbd8 (diff) |
Merge branch 'maint'
* maint:
Documentation: Reformatted SYNOPSIS for several commands
Documentation: Added [verse] to SYNOPSIS where necessary
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-archive.txt | 1 | ||||
-rw-r--r-- | Documentation/git-bundle.txt | 1 | ||||
-rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 1 | ||||
-rw-r--r-- | Documentation/git-for-each-ref.txt | 5 | ||||
-rw-r--r-- | Documentation/git-index-pack.txt | 4 | ||||
-rw-r--r-- | Documentation/git-instaweb.txt | 5 | ||||
-rw-r--r-- | Documentation/git-local-fetch.txt | 4 | ||||
-rw-r--r-- | Documentation/git-name-rev.txt | 1 | ||||
-rw-r--r-- | Documentation/git-p4import.txt | 6 | ||||
-rw-r--r-- | Documentation/git-push.txt | 4 | ||||
-rw-r--r-- | Documentation/git-rebase.txt | 2 |
11 files changed, 24 insertions, 10 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index d3ca9a90ce..721e0351c3 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -8,6 +8,7 @@ git-archive - Creates an archive of files from a named tree SYNOPSIS -------- +[verse] 'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>] [--remote=<repo>] <tree-ish> [path...] diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index 92e7a68722..5051e2bada 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -8,6 +8,7 @@ git-bundle - Move objects and refs by archive SYNOPSIS -------- +[verse] 'git-bundle' create <file> [git-rev-list args] 'git-bundle' verify <file> 'git-bundle' list-heads <file> [refname...] diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index e560b30c57..4913c2552f 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -8,6 +8,7 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- +[verse] git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD git-fmt-merge-msg [--summary | --no-summray] -F <file> diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index f49b0d944c..6df8e85004 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -7,7 +7,10 @@ git-for-each-ref - Output information on each ref 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 ----------- diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt index b7a49b9f58..226926964e 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@ -8,8 +8,10 @@ git-index-pack - Build pack index file for an existing packed archive SYNOPSIS -------- +[verse] '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 diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt index 52a6aa6e82..9df0ab2d76 100644 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@ -7,8 +7,9 @@ git-instaweb - Instantly browse your working repository in gitweb 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] DESCRIPTION diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt index dd9e2387fc..51389ef37d 100644 --- a/Documentation/git-local-fetch.txt +++ b/Documentation/git-local-fetch.txt @@ -8,7 +8,9 @@ git-local-fetch - Duplicate another git repository on a local system 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 ----------- diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt index 5b5c4c865f..d6c8bf800f 100644 --- a/Documentation/git-name-rev.txt +++ b/Documentation/git-name-rev.txt @@ -8,6 +8,7 @@ git-name-rev - Find symbolic names for given revs SYNOPSIS -------- +[verse] 'git-name-rev' [--tags] [--refs=<pattern>] ( --all | --stdin | <committish>... ) diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt index 6edb9f12b8..714abbe28e 100644 --- a/Documentation/git-p4import.txt +++ b/Documentation/git-p4import.txt @@ -8,10 +8,10 @@ git-p4import - Import a Perforce repository into git 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` diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index f8cc2b5432..e9ad10672a 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -8,7 +8,9 @@ git-push - Update remote refs along with associated objects 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 ----------- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 2f417a8f85..753b275a0f 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -7,8 +7,8 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- +[verse] 'git-rebase' [-v] [--merge] [-C<n>] [--onto <newbase>] <upstream> [<branch>] - 'git-rebase' --continue | --skip | --abort DESCRIPTION |