Merge branch 'np/malloc-threading'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0d07b1b2077c62f1199c5ee96790e5a7121b4f00..5863decdc9f96669e839b3e16cc265ddb699fce7 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -295,6 +295,7 @@ link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).
 --ignore-date::
        These flags are passed to 'git am' to easily change the dates
        of the rebased commits (see linkgit:git-am[1]).
+       Incompatible with the --interactive option.
 
 -i::
 --interactive::