diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 15:15:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 15:15:09 -0800 |
| commit | b48968522932c1f3142591d9f2a3421833de78af (patch) | |
| tree | 648febe954b673570a636b2b19ac76b570cb67c2 /git-rebase.txt | |
| parent | 59e8824741436987ea088ff1f3c7c82d6fe48fc9 (diff) | |
| download | git-htmldocs-b48968522932c1f3142591d9f2a3421833de78af.tar.gz | |
Autogenerated HTML docs for v2.24.1-485-gad05a
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 0c4f038dd..1d0e2d27c 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -393,16 +393,31 @@ your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch. --ignore-whitespace:: + Behaves differently depending on which backend is selected. ++ +'am' backend: When applying a patch, ignore changes in whitespace in +context lines if necessary. ++ +'interactive' backend: Treat lines with only whitespace changes as +unchanged for the sake of a three-way merge. + --whitespace=<option>:: - These flag are passed to the 'git apply' program + This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. + 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]). +--reset-author-date:: + 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. @@ -539,10 +554,7 @@ INCOMPATIBLE OPTIONS The following options: - * --committer-date-is-author-date - * --ignore-date * --whitespace - * --ignore-whitespace * -C are incompatible with the following options: @@ -565,6 +577,9 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges + * --preserve-merges and --ignore-whitespace + * --preserve-merges and --committer-date-is-author-date + * --preserve-merges and --ignore-date * --keep-base and --onto * --keep-base and --root |