From 1b11dcb15bd661fbf335792c7be9ea8f7aca5026 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Aug 2007 07:20:55 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc5-19-g0734d --- git-commit-tree.html | 19 +++++++------------ git-commit-tree.txt | 15 ++++++--------- git-filter-branch.html | 4 ++-- git-filter-branch.txt | 2 +- git-send-email.html | 4 ++-- git-send-email.txt | 2 +- 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/git-commit-tree.html b/git-commit-tree.html index 31643d5c8..9ac457dc8 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -334,9 +334,9 @@ 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:

GIT_AUTHOR_NAME
@@ -348,14 +348,9 @@ GIT_COMMITTER_DATE
 EMAIL

(nb "<", ">" and "\n"s are stripped)

-

In .git/config file, the following items are used for GIT_AUTHOR_NAME and -GIT_AUTHOR_EMAIL:

-
-
-
[user]
-        name = "Your Name"
-        email = "your@email.address.xz"
-
+

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.

@@ -482,7 +477,7 @@ reversible operation.

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 5870c2ce4..6a328f497 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -51,9 +51,9 @@ A commit encapsulates: - author name, email and date - 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: GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL @@ -65,12 +65,9 @@ either `.git/config` file, or using the following environment variables. (nb "<", ">" and "\n"s are stripped) -In `.git/config` file, the following items are used for GIT_AUTHOR_NAME and -GIT_AUTHOR_EMAIL: - - [user] - name = "Your Name" - email = "your@email.address.xz" +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 diff --git a/git-filter-branch.html b/git-filter-branch.html index 15e5dea01..0c418805a 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -408,7 +408,7 @@ have all of them as parents.

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 +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 @@ -572,7 +572,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 915258f41..8c43be611 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -120,7 +120,7 @@ have all of them as parents. 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 +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. + diff --git a/git-send-email.html b/git-send-email.html index 21e221ce0..b49701804 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -355,7 +355,7 @@ enabled interface to provide the necessary information.

If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. - Default is the value of sendemail.signedoffbycc configuration value; + Default is the value of sendemail.signedoffcc configuration value; if that is unspecified, default to --signed-off-by-cc.

@@ -512,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index d243ed1e3..08a023ea9 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -62,7 +62,7 @@ The --cc option must be repeated for each user you want on the cc list. --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 'sendemail.signedoffbycc' configuration value; + Default is the value of 'sendemail.signedoffcc' configuration value; if that is unspecified, default to --signed-off-by-cc. --quiet:: -- 2.26.2