From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: nd/merge-quit, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)
Date: Thu, 9 May 2019 22:54:01 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905092251200.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqlfzgg8s3.fsf@gitster-ct.c.googlers.com>
Hi Junio & Duy,
On Thu, 9 May 2019, Junio C Hamano wrote:
> * nd/merge-quit (2019-05-07) 2 commits
> - merge: add --quit
> - merge: remove drop_save() in favor of remove_merge_branch_state()
>
> "git merge" learned "--quit" option that cleans up the in-progress
> merge while leaving the working tree and the index still in a mess.
>
> Hmph, why is this a good idea?
It also seems to work *only* on Linux. At least the tests break on macOS
and on Windows:
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=8313&view=ms.vss-test-web.build-test-results-tab
Sadly, I ran out of time do look into this (I am pretty busy preparing Git
for Windows for v2.22.0-rc0).
Ciao,
Dscho
next prev parent reply other threads:[~2019-05-09 20:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 17:23 What's cooking in git.git (May 2019, #01; Thu, 9) Junio C Hamano
2019-05-08 17:48 ` Denton Liu
2019-05-08 18:02 ` Elijah Newren
2019-05-09 13:24 ` Phillip Wood
2019-05-10 13:49 ` Johannes Schindelin
2019-05-13 13:29 ` Phillip Wood
2019-05-09 13:44 ` Duy Nguyen
2019-05-09 20:45 ` en/fast-export-encoding, was " Johannes Schindelin
2019-05-10 0:14 ` Elijah Newren
2019-05-10 6:21 ` Johannes Sixt
2019-05-10 13:54 ` Johannes Schindelin
2019-05-09 20:54 ` Johannes Schindelin [this message]
2019-05-10 9:42 ` nd/merge-quit, " Duy Nguyen
2019-05-13 14:02 ` Johannes Schindelin
2019-05-13 14:06 ` Johannes Schindelin
2019-05-13 14:20 ` Eric Sunshine
2019-05-13 14:53 ` Johannes Schindelin
2019-05-13 18:32 ` [PATCH] tests: add a special setup where prerequisites fail Ævar Arnfjörð Bjarmason
2019-05-14 8:53 ` Johannes Schindelin
2019-05-14 9:41 ` Ævar Arnfjörð Bjarmason
2019-05-14 12:37 ` Johannes Schindelin
2019-05-14 13:39 ` Ævar Arnfjörð Bjarmason
2019-05-14 14:04 ` Johannes Schindelin
2019-06-20 20:42 ` [PATCH] tests: mark two failing tests under FAIL_PREREQS Ævar Arnfjörð Bjarmason
2019-06-21 18:04 ` Johannes Schindelin
2019-06-21 18:26 ` Ævar Arnfjörð Bjarmason
2019-06-21 20:08 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1905092251200.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).