From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
To: "Yannik Tausch" <dev@ytausch•de>, "Junio C Hamano" <gitster@pobox•com>
Cc: git@vger•kernel.org,
"Manuel Lerchner" <manuel.lerchner@quantco•com>,
"Yannik Tausch" <yannik.tausch@quantco•com>
Subject: Re: [PATCH v2] merge-file: honor merge.conflictStyle outside of a repository
Date: Sat, 07 Feb 2026 22:47:44 +0100 [thread overview]
Message-ID: <825e7404-f781-4739-a37b-ae3d095fda4d@app.fastmail.com> (raw)
In-Reply-To: <3488DCC3-D127-465B-BB95-3D87BB2E48F6@ytausch.de>
On Sat, Feb 7, 2026, at 22:37, Yannik Tausch wrote:
> When running outside a repository, git merge-file ignores the
> merge.conflictStyle configuration variable entirely. Since the
> function receives `repo` from the caller (which is NULL outside a
> repository), and repo_config() falls back to reading system and user
> configuration when passed NULL, pass `repo` to repo_config()
> unconditionally.
>
> Also document that merge.conflictStyle is honored.
>
> Signed-off-by: Yannik Tausch <dev@ytausch•de>
> ---
This looks good to me. Based on my previous feedback.
>
> Notes:
> Changes since v1:
> - Use repo parameter directly with repo_config() (Junio)
> - Fix AsciiDoc continuation, rename test files, break long
> lines (Kristoffer)
Nice and tidy change notes/changelog.
>[snip]
next prev parent reply other threads:[~2026-02-07 21:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-05 15:06 [DOC] merge-file: document that merge.conflictStyle requires a repository Yannik Tausch
2026-02-05 19:11 ` Junio C Hamano
2026-02-05 20:27 ` [PATCH] merge-file: honor merge.conflictStyle outside of " Yannik Tausch
2026-02-05 20:44 ` Junio C Hamano
2026-02-05 20:51 ` Kristoffer Haugsbakk
2026-02-05 21:55 ` [PATCH v2] " Yannik Tausch
2026-02-06 21:53 ` Junio C Hamano
2026-02-07 21:28 ` Yannik Tausch
2026-02-07 21:37 ` Yannik Tausch
2026-02-07 21:47 ` Kristoffer Haugsbakk [this message]
2026-02-09 9:08 ` Patrick Steinhardt
2026-02-09 16:13 ` 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=825e7404-f781-4739-a37b-ae3d095fda4d@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=dev@ytausch$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=manuel.lerchner@quantco$(echo .)com \
--cc=yannik.tausch@quantco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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