From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/4] checkout: cleanup --conflict=
Date: Fri, 08 Mar 2024 14:14:26 +0000 [thread overview]
Message-ID: <pull.1684.git.1709907270.gitgitgadget@gmail.com> (raw)
Phillip Wood (4):
xdiff-interface: refactor parsing of merge.conflictstyle
merge-ll: introduce LL_MERGE_OPTIONS_INIT
merge options: add a conflict style member
checkout: cleanup --conflict=<style> parsing
builtin/checkout.c | 40 +++++++++++++++++++++-------------------
merge-ll.c | 6 ++++--
merge-ll.h | 5 +++++
merge-ort.c | 3 ++-
merge-recursive.c | 5 ++++-
merge-recursive.h | 1 +
t/t7201-co.sh | 6 ++++++
xdiff-interface.c | 29 ++++++++++++++++++-----------
xdiff-interface.h | 1 +
9 files changed, 62 insertions(+), 34 deletions(-)
base-commit: b387623c12f3f4a376e4d35a610fd3e55d7ea907
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1684%2Fphillipwood%2Frefactor-conflict-style-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1684/phillipwood/refactor-conflict-style-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1684
--
gitgitgadget
next reply other threads:[~2024-03-08 14:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 14:14 Phillip Wood via GitGitGadget [this message]
2024-03-08 14:14 ` [PATCH 1/4] xdiff-interface: refactor parsing of merge.conflictstyle Phillip Wood via GitGitGadget
2024-03-08 14:14 ` [PATCH 2/4] merge-ll: introduce LL_MERGE_OPTIONS_INIT Phillip Wood via GitGitGadget
2024-03-08 14:14 ` [PATCH 3/4] merge options: add a conflict style member Phillip Wood via GitGitGadget
2024-03-08 15:46 ` Junio C Hamano
2024-03-08 16:13 ` phillip.wood123
2024-03-08 16:48 ` Junio C Hamano
2024-03-09 4:33 ` Elijah Newren
2024-03-09 5:46 ` Junio C Hamano
2024-03-08 14:14 ` [PATCH 4/4] checkout: cleanup --conflict=<style> parsing Phillip Wood via GitGitGadget
2024-03-08 16:15 ` Junio C Hamano
2024-03-08 16:22 ` phillip.wood123
2024-03-08 21:40 ` Junio C Hamano
2024-03-11 14:36 ` phillip.wood123
2024-03-11 17:41 ` Junio C Hamano
2024-03-12 15:50 ` Phillip Wood
2024-03-08 15:44 ` [PATCH 0/4] checkout: cleanup --conflict= Junio C Hamano
2024-03-08 16:07 ` phillip.wood123
2024-03-14 17:05 ` [PATCH v2 0/5] " Phillip Wood via GitGitGadget
2024-03-14 17:05 ` [PATCH v2 1/5] xdiff-interface: refactor parsing of merge.conflictstyle Phillip Wood via GitGitGadget
2024-03-14 17:19 ` Junio C Hamano
2024-03-14 17:05 ` [PATCH v2 2/5] merge-ll: introduce LL_MERGE_OPTIONS_INIT Phillip Wood via GitGitGadget
2024-03-14 17:05 ` [PATCH v2 3/5] merge options: add a conflict style member Phillip Wood via GitGitGadget
2024-03-14 17:21 ` Junio C Hamano
2024-03-14 17:05 ` [PATCH v2 4/5] checkout: cleanup --conflict=<style> parsing Phillip Wood via GitGitGadget
2024-03-14 17:24 ` Junio C Hamano
2024-03-14 17:05 ` [PATCH v2 5/5] checkout: fix interaction between --conflict and --merge Phillip Wood via GitGitGadget
2024-03-14 17:32 ` Junio C Hamano
2024-03-14 17:07 ` [PATCH v2 0/5] checkout: cleanup --conflict= Phillip Wood
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=pull.1684.git.1709907270.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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.