difftool/mergetool: add diffuse as merge and diff tool

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 276f1510c600e9535a750beceaa90ec0c8273389..3d5a066c31675e502eb027dde824d1966c9c0f09 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -270,6 +270,11 @@ OPTIONS
        (see linkgit:git-apply[1]) that applies the patch.
        Incompatible with the --interactive option.
 
+--committer-date-is-author-date::
+--ignore-date::
+       These flags are passed to 'git-am' to easily change the dates
+       of the rebased commits (see linkgit:git-am[1]).
+
 -i::
 --interactive::
        Make a list of the commits which are about to be rebased.  Let the