From: Junio C Hamano <gitster@pobox.com>
To: "Noah Betzen via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Noah Betzen <noah@nezteb.net>
Subject: Re: [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'
Date: Wed, 05 Oct 2022 12:23:05 -0700 [thread overview]
Message-ID: <xmqqh70ioz1i.fsf@gitster.g> (raw)
In-Reply-To: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com> (Noah Betzen via GitGitGadget's message of "Tue, 04 Oct 2022 00:55:24 +0000")
"Noah Betzen via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Noah Betzen <noah@nezteb.net>
>
> Signed-off-by: Noah Betzen <noah@nezteb.net>
> ---
> Fix minor typo in mergetool.txt
>
> I only learned of mergetool.hideResolved today, and while reading the
> docs I noticed a tiny typo, so I figured I'd fix it.
Thanks. Will apply.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1350%2FNezteb%2Fpatch-1-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1350/Nezteb/patch-1-v1
> Pull-Request: https://github.com/git/git/pull/1350
>
> Documentation/config/mergetool.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
> index 90b38097002..e779a122d8a 100644
> --- a/Documentation/config/mergetool.txt
> +++ b/Documentation/config/mergetool.txt
> @@ -59,7 +59,7 @@ mergetool.hideResolved::
> possible and write the 'MERGED' file containing conflict markers around
> any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
> represent the versions of the file from before Git's conflict
> - resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
> + 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`
> configuration variable. Defaults to `false`.
>
> base-commit: bcd6bc478adc4951d57ec597c44b12ee74bc88fb
prev parent reply other threads:[~2022-10-05 19:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 0:55 [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten' Noah Betzen via GitGitGadget
2022-10-05 19:23 ` 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=xmqqh70ioz1i.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=noah@nezteb.net \
/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).