Merge branch 'maint'

* maint:
Documentation: Reformatted SYNOPSIS for several commands
Documentation: Added [verse] to SYNOPSIS where necessary

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index d3ca9a90cee97622d2a717d618da23d20aa248e4..721e0351c3b7b50cfeadaa64af4a9e8cd5be27d5 100644 (file)
--- 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 92e7a687229761b46f57fb4197a725a075f0a0f2..5051e2bada6d2409f40a04bbd25a5201df7d836e 100644 (file)
--- 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 e560b30c571c793bff428ec32ca510bec7595155..4913c2552f9a092dbd982b55c7e7cb2ffc986570 100644 (file)
--- 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 f49b0d944c613a9d5f4a6c5b6713d5c556f0390e..6df8e8500450ad65a2de86e3daa0ab2f7692a2d2 100644 (file)
--- 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 b7a49b9f58af24844e0eae486d1cfec72bc518c6..226926964e5f3e6620f20b23b74c0299a168d07f 100644 (file)
--- 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 52a6aa6e82cda3fa0c606fd57c4ea67c4396a268..9df0ab2d76f6f024a138a84a7fd3c442342c1b88 100644 (file)
--- 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 dd9e2387fcca205b2ec80d7f6207ce84c53a7377..51389ef37da443c981f3bb5d46f819e90c3d2980 100644 (file)
--- 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 5b5c4c865f49d1da36fa1fbbcae96a33fd8da9a4..d6c8bf800f4456ea63ff7d9b0c01b2d4f0d9d179 100644 (file)
--- 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 6edb9f12b87e2bc24fb69c8615e1798bb813e14e..714abbe28ecfef592d0a7892dccbe88c8f66967c 100644 (file)
--- 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 f8cc2b5432b448dcf3686ecee68cba796064bbe4..e9ad10672a7f045f25937ca85caec548fcb4327f 100644 (file)
--- 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 2f417a8f856094b3664eeff2ff3f0ce761c89503..753b275a0f79d88ef439a4c235452bd17f81ce2e 100644 (file)
--- 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