From e84bb63b10fc7574f8430117e41b84150256f8a3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Aug 2007 07:21:08 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3-rc5-19-g0734d --- man1/git-commit-tree.1 | 19 ++++++++++--------- man1/git-filter-branch.1 | 4 ++-- man1/git-send-email.1 | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 5c1df2b1e..9e97132be 100644 --- a/man1/git-commit-tree.1 +++ b/man1/git-commit-tree.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-COMMIT\-TREE" "1" "07/19/2007" "Git 1.5.3.rc1.27.ga5e40" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "08/18/2007" "Git 1.5.3.rc5.19.g0734d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -40,7 +40,7 @@ author name, email and date \(bu committer name and email and the commit time. -If not provided, "git\-commit\-tree" uses your name, hostname and domain to provide author and committer info. This can be overridden by either .git/config file, or using the following environment variables. +While parent object ids are provided on the command line, author and commiter information is taken from the following environment variables, if set: .sp .nf GIT_AUTHOR_NAME @@ -53,13 +53,8 @@ EMAIL .fi (nb "<", ">" and "\\n"s are stripped) -In .git/config file, the following items are used for GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL: -.sp -.nf -[user] - name = "Your Name" - email = "your@email.address.xz" -.fi +In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, system user name and fully qualified hostname. + A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, "git\-commit\-tree" will just wait for one to be entered and terminated with ^D. .SH "DIAGNOSTICS" .TP @@ -89,8 +84,11 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t git\-commit\-tree (hence, git\-commit which uses it) issues an warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: .sp .nf +.ft C [i18n] commitencoding = ISO\-8859\-1 +.ft + .fi Commit objects created with the above setting record the value of i18n.commitencoding in its encoding header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF\-8. .TP @@ -98,8 +96,11 @@ Commit objects created with the above setting record the value of i18n.commitenc git\-log, git\-show and friends looks at the encoding header of a commit object, and tries to re\-code the log message into UTF\-8 unless otherwise specified. You can specify the desired output encoding with i18n.logoutputencoding in .git/config file, like this: .sp .nf +.ft C [i18n] logoutputencoding = ISO\-8859\-1 +.ft + .fi If you do not have this configuration variable, the value of i18n.commitencoding is used instead. diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index e3859e2a8..d854e463f 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-FILTER\-BRANCH" "1" "07/24/2007" "Git 1.5.3.rc2.37.g1cff" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "08/18/2007" "Git 1.5.3.rc5.19.g0734d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -57,7 +57,7 @@ As a special extension, the commit filter may emit multiple commit ids; in that \-\-tag\-name\-filter This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object). The original tag name is passed via standard input, and the new tag name is expected on standard output. -The original tags are not deleted, but can be overwritten; use "\-\-tag\-name\-filter=cat" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul. +The original tags are not deleted, but can be overwritten; use "\-\-tag\-name\-filter cat" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul. Note that there is currently no support for proper rewriting of tag objects; in layman terms, if the tag has a message or signature attached, the rewritten tag won't have it. Sorry. (It is by definition impossible to preserve signatures at any rate.) .TP diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 11ea73c1c..1c10a3afd 100644 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SEND\-EMAIL" "1" "07/20/2007" "Git 1.5.3.rc2.22.g69a9b" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "08/18/2007" "Git 1.5.3.rc5.19.g0734d" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -41,7 +41,7 @@ Specify the sender of the emails. This will default to the value GIT_COMMITTER_I Specify the contents of the first In\-Reply\-To header. Subsequent emails will refer to the previous email instead of this if \-\-chain\-reply\-to is set (the default) Only necessary if \-\-compose is also set. If \-\-compose is not set, this will be prompted for. .TP \-\-signed\-off\-by\-cc, \-\-no\-signed\-off\-by\-cc -If this is set, add emails found in Signed\-off\-by: or Cc: lines to the cc list. Default is the value of \fIsendemail.signedoffbycc\fR configuration value; if that is unspecified, default to \-\-signed\-off\-by\-cc. +If this is set, add emails found in Signed\-off\-by: or Cc: lines to the cc list. Default is the value of \fIsendemail.signedoffcc\fR configuration value; if that is unspecified, default to \-\-signed\-off\-by\-cc. .TP \-\-quiet Make git\-send\-email less verbose. One line per email should be all that is output. -- 2.26.2