git/Documentation at 60aced3dfa68df60952fed28c4ae63a5bbda0275 - git

History

Denton Liu 60aced3dfa mergetool: fallback to tool when guitool unavailable In git-difftool, if the tool is called with --gui but `diff.guitool` is not set, it falls back to `diff.tool`. Make git-mergetool also fallback from `merge.guitool` to `merge.tool` if the former is undefined. If git-difftool, when called with `--gui`, were to use `get_configured_mergetool` in a future patch, it would also get the fallback behavior in the following precedence: 1. diff.guitool 2. merge.guitool 3. diff.tool 4. merge.tool The behavior for when difftool or mergetool are called without `--gui` should be identical with or without this patch. Note that the search loop could be written as sections="merge" keys="tool" if diff_mode then sections="diff $sections" fi if gui_mode then keys="guitool $keys" fi merge_tool=$( IFS=' ' for key in $keys do for section in $sections do selected=$(git config $section.$key) if test -n "$selected" then echo "$selected" return fi done done) which would make adding a mode in the future much easier. However, adding a new mode will likely never happen as it is highly discouraged so, as a result, it is written in its current form so that it is more readable for future readers. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		6 years ago
..
RelNotes	Fifth batch for 2.20	6 years ago
howto	…
technical	Merge branch 'bp/read-cache-parallel'	6 years ago
.gitattributes	…
.gitignore	add a script to diff rendered documentation	7 years ago
CodingGuidelines	Merge branch 'jc/how-to-document-api'	6 years ago
Makefile	Merge branch 'ts/doc-build-manpage-xsl-quietly'	6 years ago
SubmittingPatches	SubmittingPatches: mention doc-diff	7 years ago
asciidoc.conf	…
asciidoctor-extensions.rb	…
blame-options.txt	…
build-docdep.perl	…
cat-texi.perl	…
cmd-list.perl	…
config.txt	Merge branch 'tb/filter-alternate-refs'	6 years ago
date-formats.txt	…
diff-config.txt	doc: document diff/merge.guitool config keys	6 years ago
diff-format.txt	…
diff-generate-patch.txt	…
diff-options.txt	Merge branch 'es/diff-color-moved-fix'	7 years ago
doc-diff	Merge branch 'es/worktree-forced-ops-fix'	6 years ago
docbook-xsl.css	…
docbook.xsl	…
everyday.txto	…
fetch-config.txt	config.txt: move fetch part out to a separate file	6 years ago
fetch-options.txt	Merge branch 'ab/fetch-tags-noclobber'	6 years ago
fix-texi.perl	…
fmt-merge-msg-config.txt	…
format-config.txt	config.txt: move format part out to a separate file	6 years ago
git-add.txt	…
git-am.txt	…
git-annotate.txt	…
git-apply.txt	…
git-archimport.txt	git-archimport.1: specify what kind of Arch we're talking about	6 years ago
git-archive.txt	…
git-bisect-lk2009.txt	…
git-bisect.txt	…
git-blame.txt	…
git-branch.txt	Merge branch 'jk/branch-l-1-repurpose'	6 years ago
git-bundle.txt	…
git-cat-file.txt	cat-file: support "unordered" output for --batch-all-objects	7 years ago
git-check-attr.txt	…
git-check-ignore.txt	…
git-check-mailmap.txt	…
git-check-ref-format.txt	…
git-checkout-index.txt	…
git-checkout.txt	…
git-cherry-pick.txt	…
git-cherry.txt	…
git-citool.txt	…
git-clean.txt	…
git-clone.txt	…
git-column.txt	git-column.1: clarify initial description, provide examples	6 years ago
git-commit-graph.txt	Doc: refer to the "commit-graph file" with dash	6 years ago
git-commit-tree.txt	…
git-commit.txt	…
git-config.txt	git-config.txt: fix 'see: above' note	6 years ago
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	…
git-cvsserver.txt	…
git-daemon.txt	…
git-describe.txt	git-describe.1: clarify that "human readable" is also git-readable	6 years ago
git-diff-files.txt	…
git-diff-index.txt	…
git-diff-tree.txt	…
git-diff.txt	…
git-difftool.txt	…
git-fast-export.txt	…
git-fast-import.txt	…
git-fetch-pack.txt	…
git-fetch.txt	…
git-filter-branch.txt	…
git-fmt-merge-msg.txt	…
git-for-each-ref.txt	Merge branch 'jk/ui-color-always-to-auto'	7 years ago
git-format-patch.txt	format-patch: allow --range-diff to apply to a lone-patch	7 years ago
git-fsck-objects.txt	…
git-fsck.txt	…
git-gc.txt	…
git-get-tar-commit-id.txt	…
git-grep.txt	grep: add -r/--[no-]recursive	6 years ago
git-gui.txt	…
git-hash-object.txt	…
git-help.txt	help -a: improve and make --verbose default	6 years ago
git-http-backend.txt	…
git-http-fetch.txt	…
git-http-push.txt	…
git-imap-send.txt	…
git-index-pack.txt	…
git-init-db.txt	…
git-init.txt	…
git-instaweb.txt	…
git-interpret-trailers.txt	Merge branch 'jk/trailer-fixes'	6 years ago
git-log.txt	…
git-ls-files.txt	…
git-ls-remote.txt	…
git-ls-tree.txt	…
git-mailinfo.txt	…
git-mailsplit.txt	…
git-merge-base.txt	…
git-merge-file.txt	…
git-merge-index.txt	…
git-merge-one-file.txt	…
git-merge-tree.txt	…
git-merge.txt	Merge branch 'en/dirty-merge-fixes'	7 years ago
git-mergetool--lib.txt	mergetool: use get_merge_tool function	6 years ago
git-mergetool.txt	mergetool: fallback to tool when guitool unavailable	6 years ago
git-mktag.txt	…
git-mktree.txt	…
git-multi-pack-index.txt	multi-pack-index: add 'verify' verb	6 years ago
git-mv.txt	…
git-name-rev.txt	…
git-notes.txt	…
git-p4.txt	git-p4: add the `p4-pre-submit` hook	7 years ago
git-pack-objects.txt	pack-objects: add delta-islands support	7 years ago
git-pack-redundant.txt	…
git-pack-refs.txt	…
git-parse-remote.txt	…
git-patch-id.txt	…
git-prune-packed.txt	…
git-prune.txt	…
git-pull.txt	…
git-push.txt	push doc: add spacing between two words	6 years ago
git-quiltimport.txt	…
git-range-diff.txt	range-diff: use dim/bold cues to improve dual color mode	7 years ago
git-read-tree.txt	…
git-rebase.txt	docs: typo: s/isimilar/similar/	6 years ago
git-receive-pack.txt	…
git-reflog.txt	…
git-remote-ext.txt	…
git-remote-fd.txt	…
git-remote-helpers.txto	…
git-remote-testgit.txt	…
git-remote.txt	…
git-repack.txt	Merge branch 'cc/delta-islands'	6 years ago
git-replace.txt	…
git-request-pull.txt	…
git-rerere.txt	rerere: add note about files with existing conflict markers	7 years ago
git-reset.txt	…
git-rev-list.txt	…
git-rev-parse.txt	…
git-revert.txt	…
git-rm.txt	…
git-send-email.txt	docs: correct RFC specifying email line length	7 years ago
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-stage.txt	…
git-stash.txt	…
git-status.txt	…
git-stripspace.txt	…
git-submodule.txt	…
git-svn.txt	…
git-symbolic-ref.txt	…
git-tag.txt	Merge branch 'jk/ui-color-always-to-auto'	7 years ago
git-tools.txt	…
git-unpack-file.txt	…
git-unpack-objects.txt	…
git-update-index.txt	Merge branch 'jc/update-index-doc'	7 years ago
git-update-ref.txt	update-ref: allow --no-deref with --stdin	6 years ago
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-web--browse.txt	…
git-whatchanged.txt	…
git-worktree.txt	worktree: teach 'remove' to override lock when --force given twice	7 years ago
git-write-tree.txt	…
git.txt	Merge branch 'ma/mailing-list-address-in-git-help'	6 years ago
gitattributes.txt	…
gitcli.txt	…
gitcore-tutorial.txt	…
gitcredentials.txt	doc: clarify gitcredentials path component matching	6 years ago
gitcvs-config.txt	config.txt: move gitcvs part out to a separate file	6 years ago
gitcvs-migration.txt	…
gitdiffcore.txt	…
giteveryday.txt	…
gitglossary.txt	…
githooks.txt	git-p4: add the `p4-pre-submit` hook	7 years ago
gitignore.txt	…
gitk.txt	…
gitmodules.txt	…
gitnamespaces.txt	…
gitremote-helpers.txt	…
gitrepository-layout.txt	…
gitrevisions.txt	push doc: correct lies about how push refspecs work	7 years ago
gitsubmodules.txt	…
gittutorial-2.txt	…
gittutorial.txt	…
gitweb.conf.txt	…
gitweb.txt	…
gitworkflows.txt	…
glossary-content.txt	…
gui-config.txt	config.txt: move gui part out to a separate file	6 years ago
howto-index.sh	…
i18n.txt	…
install-doc-quick.sh	…
install-webdoc.sh	…
line-range-format.txt	…
lint-gitlink.perl	…
mailmap.txt	…
manpage-1.72.xsl	…
manpage-base-url.xsl.in	…
manpage-base.xsl	…
manpage-bold-literal.xsl	…
manpage-normal.xsl	…
manpage-quote-apos.xsl	…
manpage-suppress-sp.xsl	…
merge-config.txt	doc: document diff/merge.guitool config keys	6 years ago
merge-options.txt	…
merge-strategies.txt	…
pretty-formats.txt	…
pretty-options.txt	…
pull-config.txt	config.txt: move pull part out to a separate file	6 years ago
pull-fetch-param.txt	fetch doc: correct grammar in --force docs	6 years ago
push-config.txt	config.txt: move push part out to a separate file	6 years ago
rebase-config.txt	…
receive-config.txt	config.txt: move receive part out to a separate file	6 years ago
rev-list-options.txt	…
revisions.txt	Merge branch 'wc/find-commit-with-pattern-on-detached-head'	7 years ago
sendemail-config.txt	config.txt: move sendemail part out to a separate file	6 years ago
sequencer.txt	…
submodule-config.txt	config.txt: move submodule part out to a separate file	6 years ago
texi.xsl	…
transfer-data-leaks.txt	…
urls-remotes.txt	…
urls.txt	…
user-manual.conf	…
user-manual.txt	…