summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2009-01-24 01:18:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-26 02:56:13 (GMT)
commita79ec62d064e32b5c3979a16d215fdb70fe965c0 (patch)
treee08668c5bef03d045bb4d32ccbef4ad766951be7 /Documentation/git-am.txt
parent3f01ad665493e09aa816d84a872d9874f33a8c16 (diff)
downloadgit-a79ec62d064e32b5c3979a16d215fdb70fe965c0.zip
git-a79ec62d064e32b5c3979a16d215fdb70fe965c0.tar.gz
git-a79ec62d064e32b5c3979a16d215fdb70fe965c0.tar.bz2
git-am: Add --ignore-date option
This new option tells 'git-am' to ignore the date header field recorded in the format-patch output. The commits will have the timestamp when they are created instead. You can work a lot in one day to accumulate many changes, but apply and push to the public repository only some of them at the end of the first day. Then next day you can spend all your working hours reading comics or chatting with your coworkers, and apply your remaining patches from the previous day using this option to pretend that you have been working at the end of the day. Signed-off-by: しらいしななこ <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt17
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index efd311b..ff307eb 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -10,7 +10,8 @@ SYNOPSIS
--------
[verse]
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
- [--3way] [--interactive]
+ [--3way] [--interactive] [--committer-date-is-author-date]
+ [--ignore-date]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject]
[<mbox> | <Maildir>...]
@@ -73,6 +74,20 @@ default. You could use `--no-utf8` to override this.
--interactive::
Run interactively.
+--committer-date-is-author-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 the committer date by using the same
+ timestamp 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.
+
--skip::
Skip the current patch. This is only meaningful when
restarting an aborted patch.