diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:02 -0800 |
| commit | a4f004bffcea5b2cd8671738305962afe7b1d08f (patch) | |
| tree | 2116e03bd949b3bb4c6e50f5088b1192706e19eb /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-am: Add --ignore-date option (diff) | |
| download | tgif-a4f004bffcea5b2cd8671738305962afe7b1d08f.tar.xz | |
Merge branch 'ns/am-slacker'
* ns/am-slacker:
git-am: Add --ignore-date option
am: Add --committer-date-is-author-date option
Conflicts:
git-am.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index efd311b1ce..ff307eb270 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. |