aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-05-04 22:19:00 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-05 22:09:02 -0700
commite77063fccb4c1627bd4656a42a508391d16e7482 (patch)
treee00d6c1c8e79a036caec6603d879e387778abb83 /Documentation/git-am.txt
parent3db964b551827e25f897cc75ffd8e520ee8b48cd (diff)
downloadgit-e77063fccb4c1627bd4656a42a508391d16e7482.tar.gz
git-e77063fccb4c1627bd4656a42a508391d16e7482.tar.xz
git-am.txt: Use date or value instead of time or timestamp
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index a497010ae..ea84cbb81 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -79,14 +79,14 @@ default. You can use `--no-utf8` to override this.
message as the commit author date, and uses the time of
commit creation as the committer date. This allows the
user to lie about the committer date by using the same
- timestamp as the author date.
+ value as the author date.
--ignore-date::
By default the command records the date from the e-mail
message as the commit author date, and uses the time of
commit creation as the committer date. This allows the
- user to lie about author timestamp by using the same
- timestamp as the committer date.
+ user to lie about the author date by using the same
+ value as the committer date.
--skip::
Skip the current patch. This is only meaningful when
@@ -115,7 +115,7 @@ DISCUSSION
----------
The commit author name is taken from the "From: " line of the
-message, and commit author time is taken from the "Date: " line
+message, and commit author date is taken from the "Date: " line
of the message. The "Subject: " line is used as the title of
the commit, after stripping common prefix "[PATCH <anything>]".
The "Subject: " line is supposed to concisely describe what the