mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <>
To: Elijah Newren <>
Cc: git <>,
Subject: Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history
Date: Tue, 14 Nov 2017 12:51:38 -0800
Message-ID: <> (raw)
In-Reply-To: <>

On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <> wrote:

>     test_expect_success 'unrelated file/submodule conflict is ignored' '
>     (
>         cd a_repo &&
>         git checkout with_file^0 &&
>         git cherry-pick with_sub^0

This makes no sense, yet. Sorry about the noise.
I think your patch is fine as is.

      reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <>
2017-11-14 17:31 ` Elijah Newren
2017-11-14 18:48   ` Stefan Beller
2017-11-14 20:51     ` Stefan Beller [this message]

Reply instructions:

You may reply publically 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:

  List information:

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

  git send-email \
    --in-reply-to='' \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:
       or Tor2web:

AGPL code for this site: git clone public-inbox