git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@github.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)
Date: Wed, 6 Apr 2011 17:46:11 -0400	[thread overview]
Message-ID: <20110406214610.GC18481@sigill.intra.peff.net> (raw)
In-Reply-To: <7v8vvni1t3.fsf@alter.siamese.dyndns.org>

On Wed, Apr 06, 2011 at 01:04:40PM -0700, Junio C Hamano wrote:

> * jk/maint-merge-rename-create (2011-03-25) 3 commits
>   (merged to 'next' on 2011-03-31 at b9bc9f1)
>  + merge: turn on rewrite detection
>  + merge: handle renames with replacement content
>  + t3030: fix accidental success in symlink rename

I think this was already your plan, but please hold off on merging this
to master. I got an off-list bug report that the top commit breaks a
cherry-pick on somebody's private repo, and I'm trying to track down the
exact reason.

-Peff

  reply	other threads:[~2011-04-06 21:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-06 20:04 What's cooking in git.git (Apr 2011, #02; Wed, 6) Junio C Hamano
2011-04-06 21:46 ` Jeff King [this message]
2011-04-10 18:52 ` Ævar Arnfjörð Bjarmason
2011-04-10 22:55   ` Jens Lehmann
2011-04-11  9:00     ` Ævar Arnfjörð Bjarmason
2011-04-11 17:55       ` Jens Lehmann
2011-04-11 18:11         ` Ævar Arnfjörð Bjarmason

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110406214610.GC18481@sigill.intra.peff.net \
    --to=peff@github.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).