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 (Oct 2011, #05; Fri, 14)
Date: Sun, 16 Oct 2011 21:20:22 -0700 [thread overview]
Message-ID: <7v39esp7uh.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20111017033706.GA26326@sigill.intra.peff.net> (Jeff King's message of "Sun, 16 Oct 2011 23:37:06 -0400")
Jeff King <peff@peff•net> writes:
> What you queued in d5570f4 looks sane, but the merge into next is
> curious.
Thanks for spotting. I think I had rerere that recorded the conflict
resolution with an older iteration of the topic with looser message
default or something.
prev parent reply other threads:[~2011-10-17 4:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 23:23 What's cooking in git.git (Oct 2011, #05; Fri, 14) Junio C Hamano
2011-10-16 16:53 ` Jeff King
2011-10-16 17:17 ` Junio C Hamano
2011-10-16 17:27 ` Jeff King
2011-10-17 3:37 ` Jeff King
2011-10-17 4:20 ` 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=7v39esp7uh.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/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