From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Vilain Subject: [PATCH 090/104] Documentation: rebase -i ignores options passed to "git am" Date: Wed, 26 May 2010 18:01:00 +1200 Message-ID: <1274853674-18521-90-git-send-email-sam.vilain@catalyst.net.nz> References: <1274853674-18521-1-git-send-email-sam.vilain@catalyst.net.nz> Cc: Markus Heidelberg , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed May 26 08:07:08 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OH9li-0004ff-AK for gcvg-git-2@lo.gmane.org; Wed, 26 May 2010 08:07:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934057Ab0EZGGp (ORCPT ); Wed, 26 May 2010 02:06:45 -0400 Received: from bertrand.catalyst.net.nz ([202.78.240.40]:49306 "EHLO mail.catalyst.net.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933949Ab0EZGG2 (ORCPT ); Wed, 26 May 2010 02:06:28 -0400 X-Greylist: delayed 304 seconds by postgrey-1.27 at vger.kernel.org; Wed, 26 May 2010 02:06:22 EDT Received: from localhost (localhost [127.0.0.1]) by mail.catalyst.net.nz (Postfix) with ESMTP id 77224337FB; Wed, 26 May 2010 18:02:08 +1200 (NZST) X-Virus-Scanned: Debian amavisd-new at catalyst.net.nz Received: from mail.catalyst.net.nz ([127.0.0.1]) by localhost (bertrand.catalyst.net.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qYfB6BGXaQGG; Wed, 26 May 2010 18:02:00 +1200 (NZST) Received: from wilber.wgtn.cat-it.co.nz (leibniz.catalyst.net.nz [202.78.240.7]) by mail.catalyst.net.nz (Postfix) with ESMTP id BEDAD338D7; Wed, 26 May 2010 18:01:36 +1200 (NZST) X-Mailer: git-send-email 1.7.1.rc2.333.gb2668 In-Reply-To: <1274853674-18521-1-git-send-email-sam.vilain@catalyst.net.nz> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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