From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 12 Feb 2009 23:51:45 GMT
Subject: Re: [PATCH] git-rebase.txt: Mention that --whitespace cannot be used with interactive rebase.
Message-ID: <alpine.DEB.1.00.0902130050420.26370@racer>
In-Reply-To: <7veiy3i61g.fsf@gitster.siamese.dyndns.org>

Hi,

On Thu, 12 Feb 2009, Junio C Hamano wrote:

> Mark Burton <markb@ordern.com> writes:
> 
> > Signed-off-by: Mark Burton <markb@ordern.com>
> > ---
> >  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=<nowarn|warn|error|error-all|strip>::
> >  	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.

The program outputs the usage and dies when -i and --whitespace (or for 
that matter, -C) are passed.

Ciao,
Dscho