From: "Noah Betzen via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Noah Betzen <noah@nezteb.net>, Noah Betzen <noah@nezteb.net>
Subject: [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'
Date: Tue, 04 Oct 2022 00:55:24 +0000 [thread overview]
Message-ID: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com> (raw)
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.
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
--
gitgitgadget
next reply other threads:[~2022-10-04 0:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 0:55 Noah Betzen via GitGitGadget [this message]
2022-10-05 19:23 ` [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten' 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=pull.1350.git.git.1664844924663.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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 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.