aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-difftool.txt
AgeCommit message (Expand)AuthorFilesLines
2024-03-01Merge branch 'ps/difftool-dir-diff-exit-code' into HEADJunio C Hamano1-1/+0
2024-02-20git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`Patrick Steinhardt1-1/+0
2023-12-26doc: enforce placeholders in documentationJean-Noël Avila1-1/+1
2023-10-09documentation: add missing articleElijah Newren1-1/+1
2023-10-09documentation: add missing wordsElijah Newren1-1/+1
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-4/+6
2022-09-07difftool docs: de-duplicate configuration sectionsÆvar Arnfjörð Bjarmason1-23/+4
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu1-0/+8
2019-05-13difftool: fallback on merge.guitoolDenton Liu1-1/+3
2017-02-08Document the --no-gui option in difftoolDenton Liu1-2/+3
2016-06-28doc: typeset long command-line options as literalMatthieu Moy1-1/+1
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar1-0/+14
2013-05-17documentation: trivial style cleanupsFelipe Contreras1-2/+1
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping1-1/+3
2013-03-14git-difftool(1): fix formatting of --symlink descriptionJohn Keeping1-2/+2
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-1/+1
2012-08-10mergetool,difftool: Document --tool-help consistentlyDavid Aguilar1-3/+3
2012-07-23difftool: Use symlinks when diffing against the worktreeDavid Aguilar1-0/+8
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan1-5/+6
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan1-0/+6
2012-03-15Documentation/difftool: add deltawalker to list of valid diff toolsTim Henigan1-2/+3
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein1-1/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk1-0/+1
2011-03-19Merge branch 'ss/mergetool--lib'Junio C Hamano1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-9/+0
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth1-2/+2
2010-12-16Merge branch 'maint'Junio C Hamano1-2/+4
2010-12-16difftool: provide basename to external toolsMichael J Gruber1-0/+1
2010-12-16git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber1-2/+3
2010-11-05docs: clarify git diff modes of operationJeff King1-1/+2
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec1-1/+1
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano1-8/+8
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar1-1/+2
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-8/+8
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar1-0/+5
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar1-0/+9
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar1-1/+1
2009-04-07difftool: add support for a difftool.prompt config variableDavid Aguilar1-1/+9
2009-04-07difftool: move 'git-difftool' out of contribDavid Aguilar1-0/+97
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-07 01:48:27 +0000