Autogenerated man pages for v1.4.0-rc1-gfd7e

diff --git a/man1/git-apply.1 b/man1/git-apply.1
index fd3db6531d71e7fb621765c0387c067cd11491a3..fbe9a19bf1d28669cc975e927c373945b9a05ebc 100755 (executable)
--- a/man1/git-apply.1
+++ b/man1/git-apply.1
@@ -74,7 +74,7 @@ Remove <n> leading slashes from traditional diff paths\&. The default is 1\&.
 
 .TP
 \-C<n>
-Ensure at least <n> lines of surrounding context match before and after each change\&. When fewer lines of surrounding context exist they all most match\&. By default no context is ever ignored\&.
+Ensure at least <n> lines of surrounding context match before and after each change\&. When fewer lines of surrounding context exist they all must match\&. By default no context is ever ignored\&.
 
 .TP
 \-\-apply

diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1
index ef77de027ab115ca01f111dd10ac0bc5de60078e..ff6111195211e0adf96b59412e1edf91faf73f49 100755 (executable)
--- a/man1/git-check-ref-format.1
+++ b/man1/git-check-ref-format.1
@@ -35,7 +35,7 @@ A reference is used in git to specify branches and tags\&. A branch head is stor
 
 .TP 3
 1.
-It could be named hierarchically (i\&.e\&. separated with slash /), but each of its component cannot begin with a dot \&.;
+It can include slash / for hierarchical (directory) grouping, but no slash\-separated component can begin with a dot \&.;
 .TP
 2.
 It cannot have two consecutive dots \&.\&. anywhere;

diff --git a/man1/git-describe.1 b/man1/git-describe.1
index 36c797bf0e97ea66488b2af7e1bd558b90027bc4..8c262fca47efaa89c2d9353556769205a0adca23 100755 (executable)
--- a/man1/git-describe.1
+++ b/man1/git-describe.1
@@ -34,7 +34,7 @@ The command finds the most recent tag that is reachable from a commit, and if th
 
 .TP
 <committish>
-The object name of the comittish\&.
+The object name of the committish\&.
 
 .TP
 \-\-all

diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1
index 7d6177846c8c0a36675c9fe90fbdfe97e53894be..3ba2293c502f033d8a4783359b760e528a6e36fb 100755 (executable)
--- a/man1/git-ls-tree.1
+++ b/man1/git-ls-tree.1
@@ -22,8 +22,11 @@
 git-ls-tree \- Lists the contents of a tree object
 .SH "SYNOPSIS"
 
-
-\fIgit\-ls\-tree\fR [\-d] [\-r] [\-t] [\-z] [\-\-name\-only] [\-\-name\-status] [\-\-full\-name] [\-\-abbrev=[<n>]] <tree\-ish> [paths...]
+.nf
+\fIgit\-ls\-tree\fR [\-d] [\-r] [\-t] [\-z]
+            [\-\-name\-only] [\-\-name\-status] [\-\-full\-name] [\-\-abbrev=[<n>]]
+            <tree\-ish> [paths...]
+.fi
 
 .SH "DESCRIPTION"
 
@@ -60,6 +63,10 @@ List only filenames (instead of the "long" output), one per line\&.
 \-\-abbrev[=<n>]
 Instead of showing the full 40\-byte hexadecimal object lines, show only handful hexdigits prefix\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
 
+.TP
+\-\-full\-name
+Instead of showing the path names relative the current working directory, show the full path names\&.
+
 .TP
 paths
 When paths are given, show them (note that this isn't really raw pathnames, but rather a list of patterns to match)\&. Otherwise implicitly uses the root level of the tree as the sole path argument\&.
@@ -83,9 +90,6 @@ Written by Petr Baudis <pasky@suse\&.cz> Completely rewritten from scratch by Ju
 
 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
 
-
-This manual page is a stub\&. You can help the git documentation by expanding it\&.
-
 .SH "GIT"
 
 

diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1
index a3613d210d35e1ffe31f717b174b5ddcea36cc3c..2d178a22a793b79a093be390ca002fabebb6ce1b 100755 (executable)
--- a/man1/git-name-rev.1
+++ b/man1/git-name-rev.1
@@ -23,7 +23,7 @@ git-name-rev \- Find symbolic names for given revs
 .SH "SYNOPSIS"
 
 
-\fIgit\-name\-rev\fR [\-\-tags] ( \-\-all | \-\-stdin | <commitish>... )
+\fIgit\-name\-rev\fR [\-\-tags] ( \-\-all | \-\-stdin | <committish>... )
 
 .SH "DESCRIPTION"
 

diff --git a/man1/git-p4import.1 b/man1/git-p4import.1
index 09921449f5f8e40208019a0b3baa1417c3bf014c..0f5256c9f57c35ac1873918730c72cb40c133bee 100755 (executable)
--- a/man1/git-p4import.1
+++ b/man1/git-p4import.1
@@ -129,7 +129,7 @@ Another option is to create multiple symlinks locally which all point to the sam
 A git tag of the form p4/xx is created for every change imported from the Perforce repository where xx is the Perforce changeset number\&. Therefore after the import you can use git to access any commit by its Perforce number, eg\&. git show p4/327\&.
 
 
-The tag associated with the HEAD commit is also how git\-p4import determines if their are new changes to incrementally import from the Perforce repository\&.
+The tag associated with the HEAD commit is also how git\-p4import determines if there are new changes to incrementally import from the Perforce repository\&.
 
 
 If you import from a repository with many thousands of changes you will have an equal number of p4/xxxx git tags\&. Git tags can be expensive in terms of disk space and repository operations\&. If you don't need to perform further incremental imports, you may delete the tags\&.

diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1
index c3662f5455affe4aa1984890a5964f1bc769c01d..0fedb5c21295ede95f78d7608b40cd131cd4c917 100755 (executable)
--- a/man1/git-read-tree.1
+++ b/man1/git-read-tree.1
@@ -238,7 +238,7 @@ You would normally use git\-merge\-index with supplied git\-merge\-one\-file to
 When you start a 3\-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file\&. It is further assumed that this state is "derived" from the stage 2 tree\&. The 3\-way merge refuses to run if it finds an entry in the original index file that does not match stage 2\&.
 
 
-This is done to prevent you from losing your work\-in\-progress changes, and mixing your random changes in an unrelated merge commit\&. To illustrate, suppose you start from what has been commited last to your repository:
+This is done to prevent you from losing your work\-in\-progress changes, and mixing your random changes in an unrelated merge commit\&. To illustrate, suppose you start from what has been committed last to your repository:
 
 .nf
 $ JC=`git\-rev\-parse \-\-verify "HEAD^0"`

diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index a3bdc4e2085875fcc616cdb3659fcf941e8b343d..c8c219d7a2d3a11814d8f5217954a05ca9f89875 100755 (executable)
--- a/man1/git-repo-config.1
+++ b/man1/git-repo-config.1
@@ -275,6 +275,10 @@ If true, the repository is made shareable between several users in a group (maki
 core\&.warnAmbiguousRefs
 If true, git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the \&.git/refs/ tree\&. True by default\&.
 
+.TP
+alias\&.*
+Command aliases for the \fBgit\fR(1) command wrapper \- e\&.g\&. after defining "alias\&.last = cat\-file commit HEAD", the invocation "git last" is equivalent to "git cat\-file commit HEAD"\&. To avoid confusion, aliases that hide existing git commands are ignored\&. Arguments are split at whitespaces, but single or double quote pair can be used to quote them\&.
+
 .TP
 apply\&.whitespace
 Tells git\-apply how to handle whitespaces, in the same way as the \fI\-\-whitespace\fR option\&. See \fBgit\-apply\fR(1)\&.
@@ -297,11 +301,11 @@ Path to a log file where the cvs pserver interface well... logs various stuff\&.
 
 .TP
 http\&.sslVerify
-Whether to verify the SSL certificate when fetching or pushing over HTTPS\&. Can be overriden by the \fIGIT_SSL_NO_VERIFY\fR environment variable\&.
+Whether to verify the SSL certificate when fetching or pushing over HTTPS\&. Can be overridden by the \fIGIT_SSL_NO_VERIFY\fR environment variable\&.
 
 .TP
 http\&.sslCert
-File containing the SSL certificate when fetching or pushing over HTTPS\&. Can be overriden by the \fIGIT_SSL_CERT\fR environment variable\&.
+File containing the SSL certificate when fetching or pushing over HTTPS\&. Can be overridden by the \fIGIT_SSL_CERT\fR environment variable\&.
 
 .TP
 http\&.sslKey
@@ -313,7 +317,7 @@ File containing the certificates to verify the peer with when fetching or pushin
 
 .TP
 http\&.sslCAPath
-Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS\&. Can be overriden by the \fIGIT_SSL_CAPATH\fR environment variable\&.
+Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS\&. Can be overridden by the \fIGIT_SSL_CAPATH\fR environment variable\&.
 
 .TP
 http\&.maxRequests

diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1
index dc30578933c9fb34eaef3ab1a2aca20d9a6e9ac5..360ac390ee720d16ac8ff052b486a0831369d6f8 100755 (executable)
--- a/man1/git-shortlog.1
+++ b/man1/git-shortlog.1
@@ -28,7 +28,22 @@ git\-log \-\-pretty=short | \fIgit\-shortlog\fR
 .SH "DESCRIPTION"
 
 
-Summarizes \fIgit log\fR output in a format suitable for inclusion in release announcements\&.
+Summarizes \fIgit log\fR output in a format suitable for inclusion in release announcements\&. Each commit will be grouped by author the first line of the commit message will be shown\&.
+
+
+Additionally, "[PATCH]" will be stripped from the commit description\&.
+
+.SH "FILES"
+
+.TP
+\fI\&.mailmap\fR
+If this file exists, it will be used for mapping author email addresses to a real author name\&. One mapping per line, first the author name followed by the email address enclosed by \fI<\fR and \fI>\fR\&. Use hash \fI#\fR for comments\&. Example:
+
+.nf
+# Keep alphabetized
+Adam Morrow <adam@localhost\&.localdomain>
+Eve Jones <eve@laptop\&.(none)>
+.fi
 
 .SH "AUTHOR"
 

diff --git a/man1/git-tar-tree.1 b/man1/git-tar-tree.1
index 8e9f62907f14100ebf4e8570b53bddc9f9f5bc34..4c17895283db2d6491c3c1caac34da5ce58a6a71 100755 (executable)
--- a/man1/git-tar-tree.1
+++ b/man1/git-tar-tree.1
@@ -23,7 +23,7 @@ git-tar-tree \- Creates a tar archive of the files in the named tree
 .SH "SYNOPSIS"
 
 
-git\-tar\-tree <tree\-ish> [ <base> ]
+\fIgit\-tar\-tree\fR [\-\-remote=<repo>] <tree\-ish> [ <base> ]
 
 .SH "DESCRIPTION"
 
@@ -33,6 +33,40 @@ Creates a tar archive containing the tree structure for the named tree\&. When <
 
 git\-tar\-tree behaves differently when given a tree ID versus when given a commit ID or tag ID\&. In the first case the current time is used as modification time of each file in the archive\&. In the latter case the commit time as recorded in the referenced commit object is used instead\&. Additionally the commit ID is stored in a global extended pax header\&. It can be extracted using git\-get\-tar\-commit\-id\&.
 
+.SH "OPTIONS"
+
+.TP
+<tree\-ish>
+The tree or commit to produce tar archive for\&. If it is the object name of a commit object\&.
+
+.TP
+<base>
+Leading path to the files in the resulting tar archive\&.
+
+.TP
+\-\-remote=<repo>
+Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository\&.
+
+.SH "EXAMPLES"
+
+.TP
+git tar\-tree HEAD | (cd /var/tmp/ && mkdir junk && tar Cxf junk \-)
+Create a tar archive that contains the contents of the latest commit on the current branch, and extracts it in /var/tmp/junk directory\&.
+
+
+git tar\-tree v2\&.6\&.17 linux\-2\&.6\&.17 | gzip >linux\-2\&.6\&.17\&.tar\&.gz
+
+.nf
+Create a tarball for v2\&.6\&.17 release\&.
+.fi
+
+
+git tar\-tree \-\-remote=example\&.com:git\&.git v0\&.99 >git\-0\&.99\&.tar
+
+.nf
+Get a tarball v0\&.99 from example\&.com\&.
+.fi
+
 .SH "AUTHOR"
 
 

diff --git a/man1/git-upload-tar.1 b/man1/git-upload-tar.1
new file mode 100755 (executable)
index 0000000..872c887
--- /dev/null
+++ b/man1/git-upload-tar.1
@@ -0,0 +1,56 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "GIT-UPLOAD-TAR" 1 "" "" ""
+.SH NAME
+git-upload-tar \- Send tar archive
+.SH "SYNOPSIS"
+
+
+\fIgit\-upload\-tar\fR <directory>
+
+.SH "DESCRIPTION"
+
+
+Invoked by \fIgit\-tar\-tree \-\-remote\fR and sends a generated tar archive to the other end over the git protocol\&.
+
+
+This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit\-tar\-tree\fR side, and the program pair is meant to be used to get a tar achive from a remote repository\&.
+
+.SH "OPTIONS"
+
+.TP
+<directory>
+The repository to get a tar archive from\&.
+
+.SH "AUTHOR"
+
+
+Written by Junio C Hamano <junio@kernel\&.org>
+
+.SH "DOCUMENTATION"
+
+
+Documentation by Junio C Hamano\&.
+
+.SH "GIT"
+
+
+Part of the \fBgit\fR(7) suite
+

diff --git a/man7/git.7 b/man7/git.7
index ef4c67a1cce8ddb5ed371a56196afeceaaa6a22b..34c0b6adcd2c6308f0a2b46ae7d24be139b09e80 100755 (executable)
--- a/man7/git.7
+++ b/man7/git.7
@@ -33,6 +33,9 @@ Git is a fast, scalable, distributed revision control system with an unusually r
 
 See this tutorial: \fItutorial.html\fR to get started, then see Everyday Git: \fIeveryday.html\fR for a useful minimum set of commands, and "man git\-commandname" for documentation of each command\&. CVS users may also want to read CVS migration: \fIcvs-migration.html\fR\&.
 
+
+The COMMAND is either a name of a Git command (see below) or an alias as defined in the configuration file (see \fBgit\-repo\-config\fR(1))\&.
+
 .SH "OPTIONS"
 
 .TP
@@ -268,6 +271,10 @@ Updates auxiliary information on a dumb server to help clients discover referenc
 \fBgit\-upload\-pack\fR(1)
 Invoked by \fIgit\-clone\-pack\fR and \fIgit\-fetch\-pack\fR to push what are asked for\&.
 
+.TP
+\fBgit\-upload\-tar\fR(1)
+Invoked by \fIgit\-tar\-tree \-\-remote\fR to return the tar archive the other end asked for\&.
+
 .SH "HIGH-LEVEL COMMANDS (PORCELAIN)"
 
 
@@ -448,6 +455,10 @@ The standard helper program to use with git\-merge\-index\&.
 \fBgit\-prune\fR(1)
 Prunes all unreachable objects from the object database\&.
 
+.TP
+\fBgit\-quiltimport\fR(1)
+Applies a quilt patchset onto the current branch\&.
+
 .TP
 \fBgit\-relink\fR(1)
 Hardlink common objects in local repositories\&.