averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kh/doc-committer-date-is-author-date'

Browse Source 
The "--committer-date-is-author-date" option of "git am/rebase" is
a misguided one.  The documentation is updated to discourage its
use.

* kh/doc-committer-date-is-author-date:
  doc: warn against --committer-date-is-author-date
This commit is contained in:
Junio C Hamano
2025-12-05 14:49:57 +09:00
parent 0534b78576 fbf3d0669f
commit 77f8d994a8
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-am.adoc
View File

@@ -162,6 +162,13 @@ Valid <action> for the `--whitespace` option are:
commit creation as the committer date. This allows the commit creation as the committer date. This allows the
user to lie about the committer date by using the same user to lie about the committer date by using the same
value as the author date. value as the author date.
+
WARNING: The history walking machinery assumes that commits have
non-decreasing commit timestamps. You should consider if you really need
to use this option. Then you should only use this option to override the
committer date when applying commits on top of a base which commit is
older (in terms of the commit date) than the oldest patch you are
applying.
--ignore-date:: --ignore-date::
By default the command records the date from the e-mail By default the command records the date from the e-mail

7
Documentation/git-rebase.adoc
View File

@@ -474,6 +474,13 @@ See also INCOMPATIBLE OPTIONS below.
Instead of using the current time as the committer date, use Instead of using the current time as the committer date, use
the author date of the commit being rebased as the committer the author date of the commit being rebased as the committer
date. This option implies `--force-rebase`. date. This option implies `--force-rebase`.
+
WARNING: The history walking machinery assumes that commits have
non-decreasing commit timestamps. You should consider if you really need
to use this option. Then you should only use this option to override the
committer date when rebasing commits on top of a base which commit is
older (in terms of the commit date) than the oldest commit you are
applying (in terms of the author date).
--ignore-date:: --ignore-date::
--reset-author-date:: --reset-author-date::