Merge branch 'hi/gpg-mintrustlevel'

[thirdparty/git.git] / Documentation / git-rebase.txt

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 1d0e2d27cc3855a260cfe4067ce3cf4a3cf94e00..0c4f038dd6077fb47436e82c2ce80b78fa6b9304 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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