* [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'
@ 2022-10-04 0:55 Noah Betzen via GitGitGadget
2022-10-05 19:23 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Noah Betzen via GitGitGadget @ 2022-10-04 0:55 UTC (permalink / raw)
To: git; +Cc: Noah Betzen, Noah Betzen
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix minor typo in mergetool.txt: 'overwriten' -> 'overwritten'
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
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-10-05 19:23 UTC (permalink / raw)
To: Noah Betzen via GitGitGadget; +Cc: git, Noah Betzen
"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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-05 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).