diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-11-01 19:30:00 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-02 15:36:23 +0900 |
| commit | cbd8db17acb77ea646c739bf96c31fe7484bc491 (patch) | |
| tree | 3648b99f63cbb6aac5f5f89700f24dc7fa141d49 /Documentation/git-rebase.txt | |
| parent | c068bcc59b4f16322a77b6a47b53d44b05c51fec (diff) | |
| download | git-cbd8db17acb77ea646c739bf96c31fe7484bc491.tar.gz | |
rebase -i: support --committer-date-is-author-date
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index a70a5cab26..b137d4f615 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -386,9 +386,13 @@ unchanged for the sake of a three-way merge. See also INCOMPATIBLE OPTIONS below. --committer-date-is-author-date:: + Instead of recording the time the rebased commits are + created as the committer date, reuse the author date + as the committer date. This implies --force-rebase. + --ignore-date:: - These flags are passed to 'git am' to easily change the dates - of the rebased commits (see linkgit:git-am[1]). + This flag is passed to 'git am' to change the author date + of each rebased commit (see linkgit:git-am[1]). + See also INCOMPATIBLE OPTIONS below. @@ -525,7 +529,6 @@ INCOMPATIBLE OPTIONS The following options: - * --committer-date-is-author-date * --ignore-date * --whitespace * -C @@ -551,6 +554,7 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --signoff * --preserve-merges and --rebase-merges * --preserve-merges and --ignore-whitespace + * --preserve-merges and --committer-date-is-author-date * --rebase-merges and --strategy * --rebase-merges and --strategy-option |