mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Edmundo Carmona Antoranz <>
To: Git List <>
Subject: Re: [PATCH v3] builtin/merge: support --squash --commit
Date: Mon, 29 Jul 2019 08:05:57 -0600	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, Jul 18, 2019 at 11:40 PM Edmundo Carmona Antoranz
<> wrote:
> Using --squash made git stop regardless of conflicts so that the
> user could finish the operation with a later call to git-commit.
> Now --squash --commit allows for the operation to finish with the
> new revision if there are no conflicts. If the user does not use
> --commit, then --no-commit is used as default so that it doesn't
> break previous git behavior.

What should I do to get this patch to move forward? Either get
comments (as the previous versions did... thanks, Junio!) or be
accepted? Given that I didn't get a feedback I thought that it had
made it (always the optimistic) but I see that it's not in Junio's
'what's cooking' mail from friday so I think it's fair to assume that
this version of the patch is not gonna fly.

Thanks in advance!

      reply	other threads:[~2019-07-29 14:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-19  5:39 [PATCH v3] builtin/merge: support --squash --commit Edmundo Carmona Antoranz
2019-07-29 14:05 ` Edmundo Carmona Antoranz [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:

  List information:

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

  git send-email \ \ \ \

* 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

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).