From: Junio C Hamano Date: Fri, 13 Feb 2009 00:50:13 GMT Subject: Re: [PATCH] git-rebase.txt: Mention that --whitespace cannot be used with interactive rebase. Message-ID: <7vy6wbgny2.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7veiy3i61g.fsf@gitster.siamese.dyndns.org> Junio C Hamano writes: > Mark Burton writes: > >> Signed-off-by: Mark Burton >> --- >> 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 3d6d429..60582a4 100644 >> --- a/Documentation/git-rebase.txt >> +++ b/Documentation/git-rebase.txt >> @@ -246,6 +246,7 @@ OPTIONS >> --whitespace=:: >> This flag is passed to the 'git-apply' program >> (see linkgit:git-apply[1]) that applies the patch. >> + Not supported when using the --interactive option. > > So is it "not supported when using", or "incompatible with"? > > If the option is silently ignored, it is former, and we have a bug. If > the program refuses to work then it is the latter. It appears it is the latter, so I've queued with a rewrite. Hope it is Ok with you. Thanks. -- >8 -- From: Mark Burton Date: Thu, 12 Feb 2009 10:21:19 +0000 Subject: [PATCH] git-rebase.txt: --interactive does not work with --whitespace Signed-off-by: Mark Burton 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 3d6d429..30487de 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -246,6 +246,7 @@ OPTIONS --whitespace=:: This flag is passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. + Incompatible with the --interactive option. -i:: --interactive::