From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Sep 2014, #02; Tue, 9)
Date: Wed, 10 Sep 2014 09:39:55 -0700 [thread overview]
Message-ID: <xmqqbnqnig4k.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140909222054.GC14029@peff.net> (Jeff King's message of "Tue, 9 Sep 2014 18:20:54 -0400")
Jeff King <peff@peff.net> writes:
> On Tue, Sep 09, 2014 at 02:26:22PM -0700, Junio C Hamano wrote:
>
>> * jk/command-line-config-empty-string (2014-08-05) 1 commit
>> (merged to 'next' on 2014-08-29 at 74f04af)
>> + config: teach "git -c" to recognize an empty string
>>
>> "git -c section.var command" and "git -c section.var= command"
>> should pass the configuration differently (the former should be
>> a boolean true, the latter should be an empty string).
>
> Hmm, there is something funny about the authorship on the sole commit in
> that topic. It's too late to fix now (and I do not care too much), but
> you may want to puzzle out what happened (stray --reset-author, weird
> use of "git am"?).
I think that I am'ed on top of 2.1.0-rc1 first, but because it was a
maintenance material, I backported it to fork from 1.8.5 maintenance
track. Perhaps rebase or cherry-pick did not work well while doing
this and I ended up doing "show | apply -3", "merge --squash", or
something silly like that.
prev parent reply other threads:[~2014-09-10 16:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 21:26 What's cooking in git.git (Sep 2014, #02; Tue, 9) Junio C Hamano
2014-09-09 22:20 ` Jeff King
2014-09-10 16:39 ` 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=xmqqbnqnig4k.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.