git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>, George Shammas <georgyo@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge -s subtree seems to be broken.
Date: Wed, 1 Aug 2018 02:58:45 +0200	[thread overview]
Message-ID: <bef616af-6b1a-d96a-8c24-841137ecf506@web.de> (raw)
In-Reply-To: <20180731155027.GA16910@sigill.intra.peff.net>

Am 31.07.2018 um 17:50 schrieb Jeff King:
> On Tue, Jul 31, 2018 at 11:03:17AM -0400, George Shammas wrote:
> 
>> Bisecting around, this might be the commit that introduced the breakage.
>>
>> https://github.com/git/git/commit/d8febde
>>
>> I really hope that it hasn't been broken for 5 years and I am just doing
>> something wrong.
> 
> Unfortunately, I think it has been broken for five years.

I don't remember this change at all. :-(  Sorry for the trouble, everyone.
I should feel ashamed, but I'm only staring in bewilderment.

René

  parent reply	other threads:[~2018-08-01  0:58 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-31 14:09 git merge -s subtree seems to be broken George Shammas
2018-07-31 15:03 ` George Shammas
2018-07-31 15:50   ` Jeff King
2018-07-31 16:08     ` Junio C Hamano
2018-08-01  0:58     ` René Scharfe [this message]
2018-07-31 15:53   ` Junio C Hamano
2018-07-31 15:56     ` George Shammas
2018-07-31 16:15     ` Jeff King
2018-07-31 17:17       ` Junio C Hamano
2018-07-31 17:23         ` Jeff King
2018-07-31 19:04           ` Jeff King
2018-07-31 19:52             ` George Shammas
2018-07-31 20:40               ` Jeff King
2018-07-31 21:06             ` Junio C Hamano
2018-08-01  0:58               ` René Scharfe
2018-08-02 18:58                 ` Jeff King
2018-08-02 18:45               ` Jeff King

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=bef616af-6b1a-d96a-8c24-841137ecf506@web.de \
    --to=l.s.r@web.de \
    --cc=georgyo@gmail.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 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).