Code

Documentation: rebase -i ignores options passed to "git am"
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 13 May 2010 12:47:53 +0000 (14:47 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 May 2010 04:51:40 +0000 (21:51 -0700)
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt

index 0d07b1b2077c62f1199c5ee96790e5a7121b4f00..5863decdc9f96669e839b3e16cc265ddb699fce7 100644 (file)
@@ -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::