diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:57 +0900 |
| commit | 77f8d994a876688f15f5fa00d5cafed235121530 (patch) | |
| tree | 8cbb436343c29b70285511986ce8fc2ae6d7058e /Documentation/git-rebase.adoc | |
| parent | 0534b78576b410d10e2cfb61802ea829713bde03 (diff) | |
| parent | fbf3d0669f830b4492070aa33f57dbf2c43fa4c8 (diff) | |
| download | git-77f8d994a876688f15f5fa00d5cafed235121530.tar.xz | |
Merge branch 'kh/doc-committer-date-is-author-date'
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
Diffstat (limited to 'Documentation/git-rebase.adoc')
| -rw-r--r-- | Documentation/git-rebase.adoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc index 005caf6164..9742833ebe 100644 --- a/Documentation/git-rebase.adoc +++ b/Documentation/git-rebase.adoc @@ -474,6 +474,13 @@ See also INCOMPATIBLE OPTIONS below. Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer 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:: --reset-author-date:: |