Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
From: Edmundo Carmona Antoranz <eantoranz@xxxxxxxxx>
Date: Wed, 17 Jul 2019 20:32:56 -0600
Cc: Git List <git@xxxxxxxxxxxxxxx>
In-reply-to: <CAOc6etYM6DSDQ_H=eJs1xuGU9a83kTe2-vEy9+FEgHobT77_Eg@mail.gmail.com>
References: <20190713051804.12893-1-eantoranz@gmail.com> <CAOc6eta-jX93k6twcrJOeRt+JHtLk4mUs7YD_bG=Ggvw4thAZQ@mail.gmail.com> <xmqq5zo01qnv.fsf@gitster-ct.c.googlers.com> <CAOc6etYM6DSDQ_H=eJs1xuGU9a83kTe2-vEy9+FEgHobT77_Eg@mail.gmail.com>

On Wed, Jul 17, 2019 at 6:41 PM Edmundo Carmona Antoranz
<eantoranz@xxxxxxxxx> wrote:
>
>
> Does it make sense to keep this file in those two situations?

yes it does. disregard the question.

References:
- [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
  - From: Edmundo Carmona Antoranz
- Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
  - From: Edmundo Carmona Antoranz
- Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
  - From: Junio C Hamano
- Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
  - From: Edmundo Carmona Antoranz

Prev by Date: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Next by Date: Re: [PATCH 1/1] clean: show an error message when the path is too long
Previous by thread: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Next by thread: [PATCH] read-cache.c: do not die if mmap fails
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]

Powered by Linux