mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Edmundo Carmona Antoranz <>
To: Git List <>
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Date: Sun, 14 Jul 2019 01:15:22 -0600	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Fri, Jul 12, 2019 at 11:18 PM Edmundo Carmona Antoranz
<> wrote:
> Option -m can be used to defined the message for the revision instead
> of the default message that contains all squashed revisions info.

I have noticed that just adding the support for -m in squash is more
complex than this patch is reaching so I think I will break this patch
into two parts:
- squash in a shot if there are no conflicts
- support -m with squash
Disregard this patch, please.

  parent reply	other threads:[~2019-07-14  7:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-13  5:18 [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts Edmundo Carmona Antoranz
2019-07-13  5:27 ` Edmundo Carmona Antoranz
2019-07-14 18:59   ` Junio C Hamano
2019-07-14  7:15 ` Edmundo Carmona Antoranz [this message]
2019-07-17 18:07   ` Junio C Hamano
2019-07-18  0:41     ` Edmundo Carmona Antoranz
2019-07-18  2:32       ` Edmundo Carmona Antoranz

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 \
    --in-reply-to='' \ \ \

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