All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philippe Blain <levraiphilippeblain@gmail.com>
To: phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)
Date: Tue, 17 Aug 2021 13:00:36 -0400	[thread overview]
Message-ID: <12bc51e2-21c5-d401-4189-8cb20b529245@gmail.com> (raw)
In-Reply-To: <92511bbe-5ef3-cfef-0a0b-30fbda2df201@gmail.com>

Hi Junio and Phillip,

Le 2021-08-17 à 06:20, Phillip Wood a écrit :
> On 17/08/2021 00:06, Junio C Hamano wrote:
>>
>> * pw/rebase-skip-final-fix (2021-08-13) 3 commits
>>   - rebase --continue: remove .git/MERGE_MSG
>>   - rebase --apply: restore some tests
>>   - t3403: fix commit authorship
>>
>>   Checking out all the paths from HEAD during the last conflicted
>>   step in "git rebase" and continuing would cause the step to be
>>   skipped (which is expected), but leaves MERGE_HEAD file behind in

This should be MERGE_MSG, no ?

>>   $GIT_DIR and confuses the next "git commit", which has been
>>   corrected.
>>
>>   Will merge to 'next'.
> 

Philippe.

  reply	other threads:[~2021-08-17 17:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 23:06 What's cooking in git.git (Aug 2021, #06; Mon, 16) Junio C Hamano
2021-08-16 23:43 ` Azeem Bande-Ali
2021-08-17 16:39   ` Junio C Hamano
2021-08-17 10:20 ` Phillip Wood
2021-08-17 17:00   ` Philippe Blain [this message]
2021-08-17 19:40     ` Junio C Hamano
2021-08-17 19:32   ` Junio C Hamano
2021-08-17 19:32     ` Junio C Hamano
2021-08-17 17:12       ` Derrick Stolee
2021-08-18  5:15         ` Eric Sunshine
2021-08-19 10:06       ` Phillip Wood
2021-08-17 21:48 ` Junio C Hamano
2021-08-19 18:55 ` Phillip Wood
2021-08-19 19:38   ` Junio C Hamano
2021-08-20  6:09 ` Giving priority to the reftable topic (was Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)) Junio C Hamano
2021-08-20 22:08   ` Ramsay Jones
2021-10-07 17:27     ` Han-Wen Nienhuys
     [not found]   ` <CACBZZX41gwo=pv_4fn2VcLz0Qq7Av-CWsnNXfXSuzmwZnu-Q3w@mail.gmail.com>
2021-08-23 10:21     ` Ævar Arnfjörð Bjarmason

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=12bc51e2-21c5-d401-4189-8cb20b529245@gmail.com \
    --to=levraiphilippeblain@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.