From: Junio C Hamano <gitster@pobox•com>
To: Mark Burton <markb@ordern•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] git-rebase.txt: Mention that --whitespace cannot be used with interactive rebase.
Date: Thu, 12 Feb 2009 16:50:13 -0800 [thread overview]
Message-ID: <7vy6wbgny2.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7veiy3i61g.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 12 Feb 2009 15:34:03 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> 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.
It appears it is the latter, so I've queued with a rewrite. Hope it is Ok
with you.
Thanks.
-- >8 --
From: Mark Burton <markb@ordern•com>
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 <markb@ordern•com>
Signed-off-by: Junio C Hamano <gitster@pobox•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..30487de 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.
+ Incompatible with the --interactive option.
-i::
--interactive::
prev parent reply other threads:[~2009-02-13 0:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 10:21 [PATCH] git-rebase.txt: Mention that --whitespace cannot be used with interactive rebase Mark Burton
2009-02-12 10:58 ` Johannes Schindelin
2009-02-12 11:32 ` Mark Burton
2009-02-12 14:44 ` Boyd Stephen Smith Jr.
2009-02-12 23:34 ` Junio C Hamano
2009-02-12 23:51 ` Johannes Schindelin
2009-02-13 0:50 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy6wbgny2.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=markb@ordern$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox