From: Sam Vilain Date: Wed, 26 May 2010 06:01:00 GMT Subject: [PATCH 090/104] Documentation: rebase -i ignores options passed to "git am" Message-ID: <1274853674-18521-90-git-send-email-sam.vilain@catalyst.net.nz> In-Reply-To: <1274853674-18521-1-git-send-email-sam.vilain@catalyst.net.nz> From: Markus Heidelberg Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 0d07b1b..5863dec 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:: -- 1.7.1.rc2.333.gb2668