summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2010-05-13 14:47:53 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-18 21:51:40 -0700
commit56a05720b1c2d5f82d4a3db4142b7a027cf8f3f7 (patch)
treebf0141ab6192624d54b03a391a8e7f90dc72f8e8
parent08bda2085cc095863888bb4bb7a73960a9a379fd (diff)
downloadgit-56a05720b1c2d5f82d4a3db4142b7a027cf8f3f7.tar.gz
Documentation: rebase -i ignores options passed to "git am"
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0d07b1b207..5863decdc9 100644
--- 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::