Kipras Melnikovas b21d164275 mergetools: vimdiff: use correct tool's name when reading mergetool config ... The /mergetools/vimdiff script, which handles both vimdiff, nvimdiff and gvimdiff mergetools (the latter 2 simply source the vimdiff script), has a function merge_cmd() which read the layout variable from git config, and it would always read the value of mergetool.**vimdiff**.layout, instead of the mergetool being currently used (vimdiff or nvimdiff or gvimdiff). It looks like in 7b5cf8be18 (vimdiff: add tool documentation, 2022-03-30), we explained the current behavior in Documentation/config/mergetool.txt: ``` mergetool.vimdiff.layout:: The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section ``` which makes sense why it's explained this way - the vimdiff backend is used by gvim and nvim. But the mergetool's configuration should be separate for each tool, and indeed that's confirmed in same commit at Documentation/mergetools/vimdiff.txt: ``` Variants Instead of `--tool=vimdiff`, you can also use one of these other variants: * `--tool=gvimdiff`, to open gVim instead of Vim. * `--tool=nvimdiff`, to open Neovim instead of Vim. When using these variants, in order to specify a custom layout you will have to set configuration variables `mergetool.gvimdiff.layout` and `mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout` ``` So it looks like we just forgot to update the 1 part of the vimdiff script that read the config variable. Cheers. Though, for backward compatibility, I've kept the mergetool.vimdiff fallback, so that people who unknowingly relied on it, won't have their setup broken now. Signed-off-by: Kipras Melnikovas <kipras@kipras.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2024-02-19 08:45:14 -08:00
..
RelNotes	RelNotes: minor typo fixes in 2.44.0 draft	2024-02-17 10:11:55 -08:00
config	mergetools: vimdiff: use correct tool's name when reading mergetool config	2024-02-19 08:45:14 -08:00
howto	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
includes	…
mergetools	mergetools: vimdiff: use correct tool's name when reading mergetool config	2024-02-19 08:45:14 -08:00
technical	setup: introduce "extensions.refStorage" extension	2024-01-02 09:24:48 -08:00
.gitattributes	…
.gitignore	…
CodingGuidelines	Merge branch 'js/contributor-docs-updates' into maint-2.43	2024-02-08 16:22:11 -08:00
Makefile	unit tests: add a project plan document	2023-11-10 08:15:25 +09:00
MyFirstContribution.txt	Merge branch 'jc/majordomo-to-subspace' into maint-2.43	2024-02-13 14:44:50 -08:00
MyFirstObjectWalk.txt	…
ReviewingGuidelines.txt	…
SubmittingPatches	SubmittingPatches: hyphenate non-ASCII	2023-12-27 21:33:24 -08:00
ToolsForGit.txt	…
asciidoc.conf	…
asciidoctor-extensions.rb	…
blame-options.txt	…
build-docdep.perl	…
cat-texi.perl	…
cmd-list.perl	…
config.txt	…
date-formats.txt	…
diff-format.txt	…
diff-generate-patch.txt	…
diff-options.txt	doc: enforce placeholders in documentation	2023-12-26 11:06:57 -08:00
doc-diff	…
docbook-xsl.css	…
docbook.xsl	…
everyday.txto	…
fetch-options.txt	fetch: add new config option fetch.all	2024-01-08 13:36:23 -08:00
fix-texi.perl	…
fsck-msgids.txt	…
git-add.txt	git-add.txt: add missing short option -A to synopsis	2023-12-15 13:01:51 -08:00
git-am.txt	Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42	2023-11-02 16:53:27 +09:00
git-annotate.txt	…
git-apply.txt	…
git-archimport.txt	…
git-archive.txt	…
git-bisect-lk2009.txt	…
git-bisect.txt	Merge branch 'jc/bisect-doc' into maint-2.43	2024-02-13 14:44:51 -08:00
git-blame.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-branch.txt	branch: clarify <oldbranch> term	2024-01-08 10:06:05 -08:00
git-bugreport.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-bundle.txt	…
git-cat-file.txt	…
git-check-attr.txt	…
git-check-ignore.txt	…
git-check-mailmap.txt	…
git-check-ref-format.txt	…
git-checkout-index.txt	…
git-checkout.txt	Merge branch 'jc/orphan-unborn'	2024-01-02 13:51:30 -08:00
git-cherry-pick.txt	…
git-cherry.txt	…
git-citool.txt	…
git-clean.txt	…
git-clone.txt	builtin/clone: introduce `--ref-format=` value flag	2024-01-02 09:24:48 -08:00
git-column.txt	…
git-commit-graph.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-commit-tree.txt	…
git-commit.txt	…
git-config.txt	doc: enforce placeholders in documentation	2023-12-26 11:06:57 -08:00
git-count-objects.txt	…
git-credential-cache--daemon.txt	…
git-credential-cache.txt	…
git-credential-store.txt	…
git-credential.txt	…
git-cvsexportcommit.txt	…
git-cvsimport.txt	doc: switch links to https	2023-11-26 10:07:05 +09:00
git-cvsserver.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-daemon.txt	doc: enforce placeholders in documentation	2023-12-26 11:06:57 -08:00
git-describe.txt	…
git-diagnose.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-diff-files.txt	…
git-diff-index.txt	…
git-diff-tree.txt	…
git-diff.txt	docs: AUTO_MERGE is not that special	2023-12-15 14:08:28 -08:00
git-difftool.txt	doc: enforce placeholders in documentation	2023-12-26 11:06:57 -08:00
git-fast-export.txt	…
git-fast-import.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-fetch-pack.txt	…
git-fetch.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-filter-branch.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-fmt-merge-msg.txt	…
git-for-each-ref.txt	ref-filter.c: sort formatted dates by byte value	2024-02-07 21:33:37 -08:00
git-for-each-repo.txt	…
git-format-patch.txt	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
git-fsck-objects.txt	…
git-fsck.txt	…
git-fsmonitor--daemon.txt	…
git-gc.txt	…
git-get-tar-commit-id.txt	…
git-grep.txt	…
git-gui.txt	…
git-hash-object.txt	…
git-help.txt	…
git-hook.txt	…
git-http-backend.txt	…
git-http-fetch.txt	…
git-http-push.txt	…
git-imap-send.txt	doc: switch links to https	2023-11-26 10:07:05 +09:00
git-index-pack.txt	index-pack: --fsck-objects to take an optional argument for fsck msgs	2024-02-01 11:09:53 -08:00
git-init-db.txt	…
git-init.txt	builtin/init: introduce `--ref-format=` value flag	2024-01-02 09:24:48 -08:00
git-instaweb.txt	…
git-interpret-trailers.txt	…
git-log.txt	…
git-ls-files.txt	ls-files: avoid the verb "deprecate" for individual options	2024-01-25 10:55:53 -08:00
git-ls-remote.txt	…
git-ls-tree.txt	…
git-mailinfo.txt	…
git-mailsplit.txt	…
git-maintenance.txt	…
git-merge-base.txt	…
git-merge-file.txt	merge-file: add --diff-algorithm option	2023-11-22 14:23:06 +09:00
git-merge-index.txt	…
git-merge-one-file.txt	…
git-merge-tree.txt	…
git-merge.txt	Merge branch 'ml/doc-merge-updates' into maint-2.43	2024-02-08 16:22:10 -08:00
git-mergetool--lib.txt	…
git-mergetool.txt	…
git-mktag.txt	…
git-mktree.txt	…
git-multi-pack-index.txt	…
git-mv.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-name-rev.txt	…
git-notes.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-p4.txt	…
git-pack-objects.txt	…
git-pack-redundant.txt	…
git-pack-refs.txt	…
git-patch-id.txt	…
git-prune-packed.txt	…
git-prune.txt	…
git-pull.txt	…
git-push.txt	Merge branch 'ms/doc-push-fix' into maint-2.42	2023-11-02 16:53:28 +09:00
git-quiltimport.txt	…
git-range-diff.txt	…
git-read-tree.txt	…
git-rebase.txt	Merge branch 'nb/rebase-x-shell-docfix' into maint-2.43	2024-02-13 14:44:49 -08:00
git-receive-pack.txt	…
git-reflog.txt	…
git-remote-ext.txt	…
git-remote-fd.txt	…
git-remote-helpers.txto	…
git-remote.txt	…
git-repack.txt	…
git-replace.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-replay.txt	replay: add --contained to rebase contained branches	2023-11-26 10:10:49 +09:00
git-request-pull.txt	…
git-rerere.txt	…
git-reset.txt	…
git-restore.txt	…
git-rev-list.txt	…
git-rev-parse.txt	builtin/rev-parse: introduce `--show-ref-format` flag	2024-01-02 09:24:48 -08:00
git-revert.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-rm.txt	…
git-send-email.txt	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
git-send-pack.txt	…
git-sh-i18n--envsubst.txt	…
git-sh-i18n.txt	…
git-sh-setup.txt	…
git-shell.txt	…
git-shortlog.txt	…
git-show-branch.txt	…
git-show-index.txt	…
git-show-ref.txt	…
git-show.txt	…
git-sparse-checkout.txt	…
git-stage.txt	…
git-stash.txt	…
git-status.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-stripspace.txt	…
git-submodule.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-svn.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-switch.txt	Merge branch 'jc/orphan-unborn'	2024-01-02 13:51:30 -08:00
git-symbolic-ref.txt	…
git-tag.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
git-tools.txt	…
git-unpack-file.txt	…
git-unpack-objects.txt	…
git-update-index.txt	…
git-update-ref.txt	…
git-update-server-info.txt	…
git-upload-archive.txt	…
git-upload-pack.txt	…
git-var.txt	…
git-verify-commit.txt	…
git-verify-pack.txt	…
git-verify-tag.txt	…
git-version.txt	…
git-web--browse.txt	…
git-whatchanged.txt	…
git-worktree.txt	orphan/unborn: add to the glossary and use them consistently	2023-11-24 12:11:23 +09:00
git-write-tree.txt	…
git.txt	Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43	2024-02-08 16:22:08 -08:00
gitattributes.txt	merge-ll: expose revision names to custom drivers	2024-01-24 13:15:06 -08:00
gitcli.txt	…
gitcore-tutorial.txt	doc: switch links to https	2023-11-26 10:07:05 +09:00
gitcredentials.txt	…
gitcvs-migration.txt	…
gitdiffcore.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
giteveryday.txt	…
gitfaq.txt	…
gitformat-bundle.txt	…
gitformat-chunk.txt	…
gitformat-commit-graph.txt	…
gitformat-index.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gitformat-pack.txt	midx: implement `BTMP` chunk	2023-12-14 14:38:07 -08:00
gitformat-signature.txt	…
gitglossary.txt	…
githooks.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gitignore.txt	…
gitk.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gitmailmap.txt	…
gitmodules.txt	…
gitnamespaces.txt	…
gitprotocol-capabilities.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gitprotocol-common.txt	…
gitprotocol-http.txt	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
gitprotocol-pack.txt	…
gitprotocol-v2.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gitremote-helpers.txt	…
gitrepository-layout.txt	doc: make the gitfile syntax easier to discover	2023-12-03 10:54:51 +09:00
gitrevisions.txt	…
gitsubmodules.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
gittutorial-2.txt	…
gittutorial.txt	…
gitweb.conf.txt	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
gitweb.txt	Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43	2024-02-08 16:22:01 -08:00
gitworkflows.txt	…
glossary-content.txt	Merge branch 'jc/orphan-unborn' into maint-2.43	2024-02-08 16:22:10 -08:00
howto-index.sh	…
i18n.txt	…
install-doc-quick.sh	…
install-webdoc.sh	…
line-range-format.txt	…
line-range-options.txt	…
lint-fsck-msgids.perl	…
lint-gitlink.perl	…
lint-man-end-blurb.perl	…
lint-man-section-order.perl	…
manpage-bold-literal.xsl	…
manpage-normal.xsl	…
manpage.xsl	…
merge-options.txt	docs: MERGE_AUTOSTASH is not that special	2023-12-15 14:08:28 -08:00
merge-strategies.txt	…
object-format-disclaimer.txt	…
pretty-formats.txt	…
pretty-options.txt	…
pull-fetch-param.txt	…
ref-reachability-filters.txt	…
ref-storage-format.txt	setup: introduce "extensions.refStorage" extension	2024-01-02 09:24:48 -08:00
rerere-options.txt	…
rev-list-description.txt	…
rev-list-options.txt	Merge branch 'ne/doc-filter-blob-limit-fix' into maint-2.43	2024-02-13 14:44:49 -08:00
revisions.txt	…
scalar.txt	…
sequencer.txt	…
signoff-option.txt	doc: switch links to https	2023-11-26 10:07:05 +09:00
texi.xsl	…
trace2-target-values.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
transfer-data-leaks.txt	…
urls-remotes.txt	…
urls.txt	doc: enforce dashes in placeholders	2023-12-26 11:06:55 -08:00
user-manual.conf	…
user-manual.txt	Merge branch 'ja/doc-placeholders-fix'	2024-02-08 13:20:34 -08:00