From: Junio C Hamano <gitster@pobox.com>
To: kristofferhaugsbakk@fastmail.com
Cc: git@vger.kernel.org,
"Kristoffer Haugsbakk" <code@khaugsbakk.name>,
"Jean-Noël Avila" <jn.avila@free.fr>
Subject: Re: [PATCH] doc: config: replace backtick with apostrophe for possessive
Date: Mon, 25 Aug 2025 13:21:39 -0700 [thread overview]
Message-ID: <xmqqwm6rp2y4.fsf@gitster.g> (raw)
In-Reply-To: <3ec6a00e3046166c7adb593f38c4099921d8ada3.1756064760.git.code@khaugsbakk.name> (kristofferhaugsbakk@fastmail.com's message of "Sun, 24 Aug 2025 21:46:51 +0200")
kristofferhaugsbakk@fastmail.com writes:
> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> Revert back to “Git's” which was used before d30c5cc4592 (doc: convert
> git-mergetool options to new synopsis style, 2025-05-25) accidentally
> changed it.
>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
> diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc
> index 6be506145c1..7064f5a462c 100644
> --- a/Documentation/config/mergetool.adoc
> +++ b/Documentation/config/mergetool.adoc
> @@ -65,7 +65,7 @@ endif::[]
> During a merge, Git will automatically resolve as many conflicts as
> possible and write the `$MERGED` file containing conflict markers around
> any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally
> - are the versions of the file from before Git`s conflict
> + are the versions of the file from before Git's conflict
> resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so
> that only the unresolved conflicts are presented to the merge tool. Can
> be configured per-tool via the `mergetool.<tool>.hideResolved`
Obviously correct. Thanks.
prev parent reply other threads:[~2025-08-25 20:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-24 19:46 [PATCH] doc: config: replace backtick with apostrophe for possessive kristofferhaugsbakk
2025-08-25 20:21 ` Junio C Hamano [this message]
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=xmqqwm6rp2y4.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=kristofferhaugsbakk@fastmail.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).