diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-21 15:14:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-25 15:09:29 +0900 |
| commit | d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53 (patch) | |
| tree | 5c324aee519eca33417edb0792e551a1f1e7633f /Documentation/git-rebase.txt | |
| parent | fe28ad8520a0ecac5dfcbfa019727aa6d79c36dc (diff) | |
| download | git-d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53.tar.gz | |
rebase -i: finishing touches to --reset-author-date
Clarify the way the `--reset-author-date` option is described,
and mark its usage string translatable.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c8d54d221d..03809da835 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -392,8 +392,10 @@ See also INCOMPATIBLE OPTIONS below. --ignore-date:: --reset-author-date:: - Instead of using the given author date, reset it to the - current time. This implies --force-rebase. + By default, the author date of the original commit is used + as the author date for the resulting commit. This option + tells Git to use the current timestamp instead and implies + `--force-rebase`. + See also INCOMPATIBLE OPTIONS below. |