From: Michael J Gruber <git@grubix.eu>
To: git@vger.kernel.org
Cc: hIpPy <hippy2981@gmail.com>
Subject: [PATCH v3 0/4] Keep merge during kills
Date: Wed, 23 Aug 2017 14:10:41 +0200 [thread overview]
Message-ID: <cover.1503489842.git.git@grubix.eu> (raw)
In-Reply-To: <xmqq1so34m6d.fsf@gitster.mtv.corp.google.com>
Compared to the 3-item v2:
1/4 == 1/3
2/4 is new as per Junio's suggestion: clarify the call-chain leading up
to prepare_to_commit()
3/4 == 2/3 with amended subject
4/4 is 3/3 rebased, squash-if removed
Michael J Gruber (4):
Documentation/git-merge: explain --continue
merge: clarify call chain
merge: split write_merge_state in two
merge: save merge state earlier
Documentation/git-merge.txt | 5 ++++-
builtin/merge.c | 15 ++++++++++++---
t/t7600-merge.sh | 15 +++++++++++++++
3 files changed, 31 insertions(+), 4 deletions(-)
--
2.14.1.426.g4352aa77a5
next prev parent reply other threads:[~2017-08-23 12:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-18 22:35 Git makes a merge commit but as a normal (non-merge) commit hIpPy
2017-08-21 10:03 ` Michael J Gruber
2017-08-21 10:06 ` [PATCH] merge: save merge state earlier Michael J Gruber
2017-08-21 12:53 ` [PATCH v2 0/3] Keep merge during kills Michael J Gruber
2017-08-21 12:53 ` [PATCH v2 1/3] Documentation/git-merge: explain --continue Michael J Gruber
2017-08-21 16:43 ` Martin Ågren
2017-08-22 9:26 ` Michael J Gruber
2017-08-22 10:06 ` Martin Ågren
2017-08-22 15:24 ` hIpPy
2017-08-22 16:11 ` Junio C Hamano
2017-08-23 12:10 ` Michael J Gruber [this message]
2017-08-23 12:10 ` [PATCH v3 1/4] " Michael J Gruber
2017-08-23 12:10 ` [PATCH v3 2/4] merge: clarify call chain Michael J Gruber
2017-08-23 12:10 ` [PATCH v3 3/4] merge: split write_merge_state in two Michael J Gruber
2017-08-23 12:10 ` [PATCH v3 4/4] merge: save merge state earlier Michael J Gruber
2017-08-22 0:20 ` [PATCH v2 1/3] Documentation/git-merge: explain --continue Junio C Hamano
2017-08-21 12:53 ` [PATCH v2 2/3] merge: split write_merge_state in two Michael J Gruber
2017-08-22 0:20 ` Junio C Hamano
2017-08-21 12:53 ` [PATCH v2 3/3] merge: save merge state earlier Michael J Gruber
2017-08-22 0:38 ` Junio C Hamano
2017-08-22 9:36 ` Michael J Gruber
2017-08-22 16:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1503489842.git.git@grubix.eu \
--to=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=hippy2981@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.
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 NNTP newsgroup(s).