From: Stephen Boyd <bebarino@gmail.com>
To: Jim Meyering <meyering@redhat.com>
Cc: git list <git@vger.kernel.org>, "Stephen C. Tweedie" <sct@redhat.com>
Subject: Re: [PATCH] format-patch let -k override a config-specified format.numbered
Date: Thu, 07 May 2009 18:03:28 -0700 [thread overview]
Message-ID: <4A0384E0.4020506@gmail.com> (raw)
In-Reply-To: <8763gcri2c.fsf@meyering.net>
Jim Meyering wrote:
> This started when a colleague reported that "git rebase master" was failing
> with a "fatal: -n and -k are mutually exclusive". Stephen Tweedie discovered
> that it was due to the format.numbered=true setting in ~/.gitconfig
> conflicting with the -k of the format-patch command run as part of
> the rebase operation. Here's a fix.
I think the real fix here should be in rebase. We should be passing
--no-numbered to format-patch. I was expecting 'format.subjectprefix' to
trigger the same bug, but it seems we don't set subject_prefix=1 in this
case. I imagine fixing that can be done in a later patch.
next prev parent reply other threads:[~2009-05-08 1:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-07 16:31 [PATCH] format-patch let -k override a config-specified format.numbered Jim Meyering
2009-05-08 1:03 ` Stephen Boyd [this message]
2009-05-09 7:08 ` Junio C Hamano
2009-05-09 8:12 ` Jim Meyering
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=4A0384E0.4020506@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=meyering@redhat.com \
--cc=sct@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).