diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-12 16:40:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-12 16:40:47 -0800 |
| commit | 6ee1922b9c47e950d6196a8b6cc5341dbb3dfae2 (patch) | |
| tree | f347e3686a5b0890357a3ff4e650a1f19b828d4f /git-rebase.txt | |
| parent | 9d828c9ace64b3d1e04ad4aa084f210138de0b1a (diff) | |
| download | git-htmldocs-6ee1922b9c47e950d6196a8b6cc5341dbb3dfae2.tar.gz | |
Autogenerated HTML docs for v2.25.0-rc2-24-gb4615
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 1d0e2d27c..0c4f038dd 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -393,31 +393,16 @@ 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>:: - This flag is passed to the 'git apply' program + These flag are 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:: ---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`. + These flags are passed to 'git am' to easily change the dates + of the rebased commits (see linkgit:git-am[1]). + See also INCOMPATIBLE OPTIONS below. @@ -554,7 +539,10 @@ INCOMPATIBLE OPTIONS The following options: + * --committer-date-is-author-date + * --ignore-date * --whitespace + * --ignore-whitespace * -C are incompatible with the following options: @@ -577,9 +565,6 @@ 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 |