diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index b137d4f615..9a1eabad0f 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -391,8 +391,8 @@ See also INCOMPATIBLE OPTIONS below. as the committer date. This implies --force-rebase. --ignore-date:: - This flag is passed to 'git am' to change the author date - of each rebased commit (see linkgit:git-am[1]). + Instead of using the given author date, reset it to the + current time. This implies --force-rebase. + See also INCOMPATIBLE OPTIONS below. @@ -529,7 +529,6 @@ INCOMPATIBLE OPTIONS The following options: - * --ignore-date * --whitespace * -C @@ -555,6 +554,7 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --rebase-merges * --preserve-merges and --ignore-whitespace * --preserve-merges and --committer-date-is-author-date + * --preserve-merges and --ignore-date * --rebase-merges and --strategy * --rebase-merges and --strategy-option |