From: Junio C Hamano <junio@hera.kernel.org>
Date: Sat, 7 Jan 2006 01:17:58 +0000 (-0800)
Subject: Autogenerated man pages for 026351a03507dc3a2e89e068c01234dc55914df2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=736fe60db4434470f9fbe3618e565257bb9825c8;p=git.git

Autogenerated man pages for 026351a03507dc3a2e89e068c01234dc55914df2
---

diff --git a/man1/git-add.1 b/man1/git-add.1
index ebacf16e..3c036d71 100755
--- a/man1/git-add.1
+++ b/man1/git-add.1
@@ -47,7 +47,7 @@ Be verbose\&.
 .SH "DISCUSSION"
 
 
-The list of <file> given to the command is fed to git\-ls\-files command to list files that are not registerd in the index and are not ignored/excluded by $GIT_DIR/info/exclude file or \&.gitignore file in each directory\&. This means two things:
+The list of <file> given to the command is fed to git\-ls\-files command to list files that are not registered in the index and are not ignored/excluded by $GIT_DIR/info/exclude file or \&.gitignore file in each directory\&. This means two things:
 
 .TP 3
 1.
diff --git a/man1/git-am.1 b/man1/git-am.1
index 4193b3ac..c1e5164e 100755
--- a/man1/git-am.1
+++ b/man1/git-am.1
@@ -22,8 +22,10 @@
 git-am \- Apply a series of patches in a mailbox
 .SH "SYNOPSIS"
 
-
-git\-am [\-\-signoff] [\-\-dotest=<dir>] [\-\-utf8] [\-\-binary] [\-\-3way] <mbox>... git\-am [\-\-skip | \-\-resolved]
+.nf
+git\-am [\-\-signoff] [\-\-dotest=<dir>] [\-\-utf8] [\-\-binary] [\-\-3way] <mbox>...
+git\-am [\-\-skip | \-\-resolved]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-apply.1 b/man1/git-apply.1
index aca1a719..5dac11d2 100755
--- a/man1/git-apply.1
+++ b/man1/git-apply.1
@@ -22,8 +22,11 @@
 git-apply \- Apply patch on a git index file and a work tree
 .SH "SYNOPSIS"
 
-
-git\-apply [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply] [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z] [<patch>...]
+.nf
+git\-apply [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply]
+          [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z]
+          [<patch>...]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-archimport.1 b/man1/git-archimport.1
index 601271e3..3f3a4b67 100755
--- a/man1/git-archimport.1
+++ b/man1/git-archimport.1
@@ -22,13 +22,15 @@
 git-archimport \- Import an Arch repository into git
 .SH "SYNOPSIS"
 
-
-git\-archimport [ \-h ] [ \-v ] [ \-o ] [ \-a ] [ \-f ] [ \-T ] [ \-D depth ] [ \-t tempdir ] <archive/branch> [ <archive/branch> ]
+.nf
+git\-archimport [\-h] [\-v] [\-o] [\-a] [\-f] [\-T] [\-D depth] [\-t tempdir]
+               <archive/branch> [ <archive/branch> ]
+.fi
 
 .SH "DESCRIPTION"
 
 
-Imports a project from one or more Arch repositories\&. It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters suppplied\&. If it cannot find the remote branch a merge comes from it will just import it as a regular commit\&. If it can find it, it will mark it as a merge whenever possible (see discussion below)\&.
+Imports a project from one or more Arch repositories\&. It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters supplied\&. If it cannot find the remote branch a merge comes from it will just import it as a regular commit\&. If it can find it, it will mark it as a merge whenever possible (see discussion below)\&.
 
 
 The script expects you to provide the key roots where it can start the import from an initial import or tag type of Arch commit\&. It will follow and import new branches within the provided roots\&.
diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1
index a7fb17af..01f73860 100755
--- a/man1/git-cat-file.1
+++ b/man1/git-cat-file.1
@@ -23,7 +23,7 @@ git-cat-file \- Provide content or type information for repository objects
 .SH "SYNOPSIS"
 
 
-git\-cat\-file (\-t | \-s | \-e | <type>) <object>
+git\-cat\-file [\-t | \-s | \-e | <type>] <object>
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1
index fe5e3ad2..c167462f 100755
--- a/man1/git-checkout-index.1
+++ b/man1/git-checkout-index.1
@@ -22,8 +22,10 @@
 git-checkout-index \- Copy files from the index to the working directory
 .SH "SYNOPSIS"
 
-
-git\-checkout\-index [\-u] [\-q] [\-a] [\-f] [\-n] [\-\-prefix=<string>] [\-\-stage=<number>] [\-\-] <file>...
+.nf
+git\-checkout\-index [\-u] [\-q] [\-a] [\-f] [\-n] [\-\-prefix=<string>]
+                   [\-\-stage=<number>] [\-\-] <file>...
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-clone.1 b/man1/git-clone.1
index 4966bab0..1d9bfcb3 100755
--- a/man1/git-clone.1
+++ b/man1/git-clone.1
@@ -22,8 +22,10 @@
 git-clone \- Clones a repository.
 .SH "SYNOPSIS"
 
-
-git\-clone [\-l [\-s]] [\-q] [\-n] [\-o <name>] [\-u <upload\-pack>] <repository> [<directory>]
+.nf
+git\-clone [\-l [\-s]] [\-q] [\-n] [\-o <name>] [\-u <upload\-pack>]
+          <repository> [<directory>]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1
index d62dd01e..3129204d 100755
--- a/man1/git-commit-tree.1
+++ b/man1/git-commit-tree.1
@@ -80,7 +80,7 @@ GIT_COMMITTER_EMAIL
 (nb "<", ">" and "\\n"s are stripped)
 
 
-In \&.git/config file, the following items are used:
+In \&.git/config file, the following items are used for GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL:
 
 .nf
 [user]
diff --git a/man1/git-commit.1 b/man1/git-commit.1
index 9a7ce8be..32913cf9 100755
--- a/man1/git-commit.1
+++ b/man1/git-commit.1
@@ -22,8 +22,10 @@
 git-commit \- Record your changes
 .SH "SYNOPSIS"
 
-
-git\-commit [\-a] [\-s] [\-v] [(\-c | \-C) <commit> | \-F <file> | \-m <msg>] [\-e] [\-\-] <file>...
+.nf
+git\-commit [\-a] [\-s] [\-v] [(\-c | \-C) <commit> | \-F <file> | \-m <msg>]
+           [\-e] [\-\-] <file>...
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1
index 3ebbce8d..3c50de07 100755
--- a/man1/git-cvsexportcommit.1
+++ b/man1/git-cvsexportcommit.1
@@ -23,7 +23,7 @@ git-cvsexportcommit \- Export a commit to a CVS checkout
 .SH "SYNOPSIS"
 
 
-git\-cvsexportcommmit\&.perl [ \-h ] [ \-v ] [ \-c ] [ \-p ] [PARENTCOMMIT] COMMITID
+git\-cvsexportcommmit [\-h] [\-v] [\-c] [\-p] [PARENTCOMMIT] COMMITID
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1
index f23e33a4..aa89209e 100755
--- a/man1/git-cvsimport.1
+++ b/man1/git-cvsimport.1
@@ -22,8 +22,11 @@
 git-cvsimport \- Import a CVS repository into git
 .SH "SYNOPSIS"
 
-
-git\-cvsimport [ \-o <branch\-for\-HEAD> ] [ \-h ] [ \-v ] [ \-d <CVSROOT> ] [ \-p <options\-for\-cvsps> ] [ \-C <git_repository> ] [ \-i ] [ \-P <file> ] [ \-k ] [ \-s <subst> ] [ \-m ] [ \-M regex ] [ <CVS_module> ]
+.nf
+git\-cvsimport [\-o <branch\-for\-HEAD>] [\-h] [\-v] [\-d <CVSROOT>] [\-s <subst>]
+              [\-p <options\-for\-cvsps>] [\-C <git_repository>] [\-i] [\-P <file>]
+              [\-m] [\-M regex] [<CVS_module>]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-daemon.1 b/man1/git-daemon.1
index 29cb1abc..73c41cce 100755
--- a/man1/git-daemon.1
+++ b/man1/git-daemon.1
@@ -22,8 +22,10 @@
 git-daemon \- A really simple server for git repositories.
 .SH "SYNOPSIS"
 
-
-git\-daemon [\-\-verbose] [\-\-syslog] [\-\-inetd | \-\-port=n] [\-\-export\-all] [\-\-timeout=n] [\-\-init\-timeout=n] [\-\-strict\-paths] [directory...]
+.nf
+git\-daemon [\-\-verbose] [\-\-syslog] [\-\-inetd | \-\-port=n] [\-\-export\-all]
+           [\-\-timeout=n] [\-\-init\-timeout=n] [\-\-strict\-paths] [directory...]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index 4785d47e..275d4bdb 100755
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.1
@@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post
 
 .TP
 \-\-abbrev[=<n>]
-Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
+Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
 
 .TP
 \-B
@@ -258,7 +258,7 @@ What \-p option produces is slightly different from the traditional diff format\
 
 .TP 3
 1.
-It is preceeded with a "git diff" header, that looks like this:
+It is preceded with a "git diff" header, that looks like this:
 
 
 .nf
diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index 93dfa505..7e6bf468 100755
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.1
@@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post
 
 .TP
 \-\-abbrev[=<n>]
-Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
+Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
 
 .TP
 \-B
@@ -260,7 +260,7 @@ What \-p option produces is slightly different from the traditional diff format\
 
 .TP 3
 1.
-It is preceeded with a "git diff" header, that looks like this:
+It is preceded with a "git diff" header, that looks like this:
 
 
 .nf
@@ -307,7 +307,7 @@ contents (the ones I'd write with a "git\-write\-tree")
 .fi
 
 
-For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit\&. You want to see eactly what you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do
+For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit\&. You want to see exactly what you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do
 
 .nf
 git\-diff\-index \-\-cached HEAD
@@ -359,7 +359,7 @@ ie it shows that the tree has changed, and that kernel/sched\&.c has is not up\-
 .Sh "Note"
 
 
-As with other commands of this type, "git\-diff\-index" does not actually look at the contents of the file at all\&. So maybe kernel/sched\&.c hasn't actually changed, and it's just that you touched it\&. In either case, it's a note that you need to "git\-upate\-index" it to make the index be in sync\&.
+As with other commands of this type, "git\-diff\-index" does not actually look at the contents of the file at all\&. So maybe kernel/sched\&.c hasn't actually changed, and it's just that you touched it\&. In either case, it's a note that you need to "git\-update\-index" it to make the index be in sync\&.
 
 .RE
 
diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1
index 94febbad..d5622bd9 100755
--- a/man1/git-diff-stages.1
+++ b/man1/git-diff-stages.1
@@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post
 
 .TP
 \-\-abbrev[=<n>]
-Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
+Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
 
 .TP
 \-B
@@ -252,7 +252,7 @@ What \-p option produces is slightly different from the traditional diff format\
 
 .TP 3
 1.
-It is preceeded with a "git diff" header, that looks like this:
+It is preceded with a "git diff" header, that looks like this:
 
 
 .nf
diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 84736451..13902b7f 100755
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -22,8 +22,10 @@
 git-diff-tree \- Compares the content and mode of blobs found via two tree objects
 .SH "SYNOPSIS"
 
-
-git\-diff\-tree [\-\-stdin] [\-m] [\-s] [\-v] [\-\-no\-commit\-id] [\-\-pretty] [\-t] [\-r] [\-\-root] [<common diff options>] <tree\-ish> [<tree\-ish>] [<path>...]
+.nf
+git\-diff\-tree [\-\-stdin] [\-m] [\-s] [\-v] [\-\-no\-commit\-id] [\-\-pretty] [\-t] [\-r]
+              [\-\-root] [<common diff options>] <tree\-ish> [<tree\-ish>] [<path>...]
+.fi
 
 .SH "DESCRIPTION"
 
@@ -64,7 +66,7 @@ Instead of the first handful characters, show full object name of pre\- and post
 
 .TP
 \-\-abbrev[=<n>]
-Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
+Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
 
 .TP
 \-B
@@ -137,7 +139,7 @@ By default, "git\-diff\-tree \-\-stdin" does not show differences for merge comm
 
 .TP
 \-s
-By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-readable form (without \-p) or in patch form (with \-p)\&. This output can be supressed\&. It is only useful with \-v flag\&.
+By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-readable form (without \-p) or in patch form (with \-p)\&. This output can be suppressed\&. It is only useful with \-v flag\&.
 
 .TP
 \-v
@@ -350,7 +352,7 @@ What \-p option produces is slightly different from the traditional diff format\
 
 .TP 3
 1.
-It is preceeded with a "git diff" header, that looks like this:
+It is preceded with a "git diff" header, that looks like this:
 
 
 .nf
diff --git a/man1/git-diff.1 b/man1/git-diff.1
index 6b46816c..2b907c06 100755
--- a/man1/git-diff.1
+++ b/man1/git-diff.1
@@ -77,7 +77,7 @@ $ git diff HEAD^ HEAD
  instead of using the tip of the current branch, compare with the
 tip of "test" branch\&.
  instead of comparing with the tip of "test" branch, compare with
-the tip of the curren branch, but limit the comparison to the
+the tip of the current branch, but limit the comparison to the
 file "test"\&.
  compare the version before the last commit and the last commit\&.
 .TP
diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1
index 0e1779ca..e179bd2b 100755
--- a/man1/git-format-patch.1
+++ b/man1/git-format-patch.1
@@ -22,8 +22,10 @@
 git-format-patch \- Prepare patches for e-mail submission.
 .SH "SYNOPSIS"
 
-
-git\-format\-patch [\-n | \-k] [\-o <dir> | \-\-stdout] [\-s] [\-c] [\-\-mbox] [\-\-diff\-options] <his> [<mine>]
+.nf
+git\-format\-patch [\-n | \-k] [\-o <dir> | \-\-stdout] [\-s] [\-c] [\-\-mbox]
+                 [\-\-diff\-options] <his> [<mine>]
+.fi
 
 .SH "DESCRIPTION"
 
@@ -90,7 +92,7 @@ The same as the previous one, except detect and handle renames and complete rewr
 .SH "SEE ALSO"
 
 
-\fBgit\-am\fR(1), gitlink:git\-send\-email
+\fBgit\-am\fR(1), \fBgit\-send\-email\fR(1)
 
 .SH "AUTHOR"
 
diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1
index 0d08b758..f4c87478 100755
--- a/man1/git-fsck-objects.1
+++ b/man1/git-fsck-objects.1
@@ -22,8 +22,10 @@
 git-fsck-objects \- Verifies the connectivity and validity of the objects in the database
 .SH "SYNOPSIS"
 
-
-git\-fsck\-objects [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache] [\-\-standalone | \-\-full] [\-\-strict] [<object>*]
+.nf
+git\-fsck\-objects [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache]
+                 [\-\-standalone | \-\-full] [\-\-strict] [<object>*]
+.fi
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-grep.1 b/man1/git-grep.1
index 5b6e697c..be73f778 100755
--- a/man1/git-grep.1
+++ b/man1/git-grep.1
@@ -23,7 +23,7 @@ git-grep \- print lines matching a pattern
 .SH "SYNOPSIS"
 
 
-git\-grep <option>... <pattern> <path>...
+git\-grep [<option>...] <pattern> [<path>...]
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1
index 3de9de43..f9ffa716 100755
--- a/man1/git-http-fetch.1
+++ b/man1/git-http-fetch.1
@@ -19,11 +19,11 @@
 ..
 .TH "GIT-HTTP-FETCH" 1 "" "" ""
 .SH NAME
-git-http-fetch \- Downloads a remote git repository via HTTP
+git-http-fetch \- downloads a remote git repository via HTTP
 .SH "SYNOPSIS"
 
 
-git\-http\-fetch [\-c] [\-t] [\-a] [\-d] [\-v] [\-w filename] [\-\-recover] commit\-id url
+git\-http\-fetch [\-c] [\-t] [\-a] [\-d] [\-v] [\-w filename] [\-\-recover] <commit> <url>
 
 .SH "DESCRIPTION"
 
diff --git a/man1/git-init-db.1 b/man1/git-init-db.1
index 31f92d9f..1e1f3491 100755
--- a/man1/git-init-db.1
+++ b/man1/git-init-db.1
@@ -23,7 +23,7 @@ git-init-db \- Creates an empty git repository
 .SH "SYNOPSIS"
 
 
-git\-init\-db [\-\-template=<template_directory>]
+git\-init\-db [\-\-template=<template_directory>] [\-\-shared]
 
 .SH "OPTIONS"
 
@@ -31,6 +31,10 @@ git\-init\-db [\-\-template=<template_directory>]
 \-\-template=<template_directory>
 Provide the directory in from which templates will be used\&.
 
+.TP
+\-\-shared
+Specify that the git repository is to be shared amongst several users\&.
+
 .SH "DESCRIPTION"
 
 
@@ -43,7 +47,10 @@ If the $GIT_DIR environment variable is set then it specifies a path to use inst
 If the object storage directory is specified via the $GIT_OBJECT_DIRECTORY environment variable then the sha1 directories are created underneath \- otherwise the default $GIT_DIR/objects directory is used\&.
 
 
-git\-init\-db won't hurt an existing repository\&.
+A shared repository allows users belonging to the same group to push into that repository\&. When specifying \-\-shared the config variable "core\&.sharedRepository" is set to true so that directories under $GIT_DIR are made group writable (and g+sx, since the git group may be not the primary group of all users)\&.
+
+
+Running git\-init\-db in an existing repository is safe\&. It will not overwrite things that are already there\&. The primary reason for rerunning git\-init\-db is to pick up newly added templates\&.
 
 .SH "EXAMPLES"
 
diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1
index b2797e5e..6b79f279 100755
--- a/man1/git-ls-files.1
+++ b/man1/git-ls-files.1
@@ -93,7 +93,7 @@ unmerged
 R
 removed/deleted
 C
-modifed/changed
+modified/changed
 K
 to be killed ? other
 
diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1
index e3019ac7..599771c8 100755
--- a/man1/git-pack-objects.1
+++ b/man1/git-pack-objects.1
@@ -47,7 +47,7 @@ Write into a pair of files (\&.pack and \&.idx), using <base\-name> to determine
 
 .TP
 \-\-stdout
-Write the pack contents (what would have been writtin to \&.pack file) out to the standard output\&.
+Write the pack contents (what would have been written to \&.pack file) out to the standard output\&.
 
 .TP
 \-\-window and \-\-depth
diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index aac546a8..298c38fb 100755
--- a/man1/git-repo-config.1
+++ b/man1/git-repo-config.1
@@ -31,7 +31,7 @@ git\-repo\-config name [value [value_regex]] git\-repo\-config \-\-replace\-all
 You can query/set/replace/unset options with this command\&. The name is actually the section and the key separated by a dot, and the value will be escaped\&.
 
 
-If you want to set/unset an option which can occor on multiple lines, you should provide a POSIX regex for the value\&. If you want to handle the lines not matching the regex, just prepend a single exlamation mark in front (see EXAMPLES)\&.
+If you want to set/unset an option which can occur on multiple lines, you should provide a POSIX regex for the value\&. If you want to handle the lines not matching the regex, just prepend a single exclamation mark in front (see EXAMPLES)\&.
 
 
 This command will fail if
diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1
index a059d998..6b971f15 100755
--- a/man1/git-rev-list.1
+++ b/man1/git-rev-list.1
@@ -22,8 +22,20 @@
 git-rev-list \- Lists commit objects in reverse chronological order
 .SH "SYNOPSIS"
 
-
-git\-rev\-list [ \-\-max\-count=number ] [ \-\-max\-age=timestamp ] [ \-\-min\-age=timestamp ] [ \-\-sparse ] [ \-\-no\-merges ] [ \-\-all ] [ [ \-\-merge\-order [ \-\-show\-breaks ] ] | [ \-\-topo\-order ] | ] [ \-\-parents ] [ \-\-objects [ \-\-unpacked ] ] [ \-\-pretty | \-\-header | ] [ \-\-bisect ] <commit>... [ \-\- <paths>... ]
+.nf
+git\-rev\-list [ \-\-max\-count=number ]
+             [ \-\-max\-age=timestamp ]
+             [ \-\-min\-age=timestamp ]
+             [ \-\-sparse ]
+             [ \-\-no\-merges ]
+             [ \-\-all ]
+             [ [ \-\-merge\-order [ \-\-show\-breaks ] ] | [ \-\-topo\-order ] ]
+             [ \-\-parents ]
+             [ \-\-objects [ \-\-unpacked ] ]
+             [ \-\-pretty | \-\-header ]
+             [ \-\-bisect ]
+             <commit>... [ \-\- <paths>... ]
+.fi
 
 .SH "DESCRIPTION"
 
@@ -109,7 +121,7 @@ Commits marked with (=) represent the boundaries of minimal, non\-linear epochs
 
 Commits marked with (|) are direct parents of commits immediately preceding the marked commit in the list\&.
 
-Commits marked with (^) are not parents of the immediately preceding commit\&. These "breaks" represent necessary discontinuities implied by trying to represent an arbtirary DAG in a linear form\&.
+Commits marked with (^) are not parents of the immediately preceding commit\&. These "breaks" represent necessary discontinuities implied by trying to represent an arbitrary DAG in a linear form\&.
 
 \-\-show\-breaks is only valid if \-\-merge\-order is also specified\&.
 
diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1
index e6b65a35..63a8fcad 100755
--- a/man1/git-show-branch.1
+++ b/man1/git-show-branch.1
@@ -84,7 +84,7 @@ Note that \-\-more, \-\-list, \-\-independent and \-\-merge\-base options are mu
 Given N <references>, the first N lines are the one\-line description from their commit message\&. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk * character while other heads are prefixed with a ! character\&.
 
 
-Following these N lines, one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a + sign; otherwise it shows a space\&. Each commit shows a short name that can be used as an exended SHA1 to name that commit\&.
+Following these N lines, one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a + sign; otherwise it shows a space\&. Each commit shows a short name that can be used as an extended SHA1 to name that commit\&.
 
 
 The following example shows three branches, "master", "fixes" and "mhf":
diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1
index 71fcbc7d..9c9d583e 100755
--- a/man1/git-svnimport.1
+++ b/man1/git-svnimport.1
@@ -23,7 +23,7 @@ git-svnimport \- Import a SVN repository into git
 .SH "SYNOPSIS"
 
 
-git\-svnimport [ \-o <branch\-for\-HEAD> ] [ \-h ] [ \-v ] [ \-d | \-D ] [ \-C <GIT_repository> ] [ \-i ] [ \-u ] [\-l limit_rev] [ \-b branch_subdir ] [ \-t trunk_subdir ] [ \-T tag_subdir ] [ \-s start_chg ] [ \-m ] [ \-M regex ] <SVN_repository_URL> [ <path> ]
+git\-svnimport [ \-o <branch\-for\-HEAD> ] [ \-h ] [ \-v ] [ \-d | \-D ] [ \-C <GIT_repository> ] [ \-i ] [ \-u ] [\-l limit_rev] [ \-b branch_subdir ] [ \-T trunk_subdir ] [ \-t tag_subdir ] [ \-s start_chg ] [ \-m ] [ \-M regex ] <SVN_repository_URL> [ <path> ]
 
 .SH "DESCRIPTION"
 
@@ -52,18 +52,18 @@ The GIT repository to import to\&. If the directory doesn't exist, it will be cr
 \-s <start_rev>
 Start importing at this SVN change number\&. The default is 1\&.
 
-When importing incementally, you might need to edit the \&.git/svn2git file\&.
+When importing incrementally, you might need to edit the \&.git/svn2git file\&.
 
 .TP
 \-i
 Import\-only: don't perform a checkout after importing\&. This option ensures the working directory and index remain untouched and will not create them if they do not exist\&.
 
 .TP
-\-t <trunk_subdir>
+\-T <trunk_subdir>
 Name the SVN trunk\&. Default "trunk"\&.
 
 .TP
-\-T <tag_subdir>
+\-t <tag_subdir>
 Name the SVN subdirectory for tags\&. Default "tags"\&.
 
 .TP
diff --git a/man7/git.7 b/man7/git.7
index b035e4b0..01865188 100755
--- a/man7/git.7
+++ b/man7/git.7
@@ -501,7 +501,7 @@ Pick out and massage parameters\&.
 Send patch e\-mails out of "format\-patch \-\-mbox" output\&.
 
 .TP
-\fBgit\-symbolic\-refs\fR(1)
+\fBgit\-symbolic\-ref\fR(1)
 Read and modify symbolic refs\&.
 
 .TP