summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
AgeCommit message (Expand)Author
2022-09-07difftool docs: de-duplicate configuration sectionsÆvar Arnfjörð Bjarmason
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu
2019-05-13difftool: fallback on merge.guitoolDenton Liu
2017-02-08Document the --no-gui option in difftoolDenton Liu
2016-06-28doc: typeset long command-line options as literalMatthieu Moy
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar
2013-05-17documentation: trivial style cleanupsFelipe Contreras
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping
2013-03-14git-difftool(1): fix formatting of --symlink descriptionJohn Keeping
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann
2012-08-10mergetool,difftool: Document --tool-help consistentlyDavid Aguilar
2012-07-23difftool: Use symlinks when diffing against the worktreeDavid Aguilar
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan
2012-03-15Documentation/difftool: add deltawalker to list of valid diff toolsTim Henigan
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk
2011-03-20Merge branch 'ss/mergetool--lib'Junio C Hamano
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth
2010-12-17Merge branch 'maint'Junio C Hamano
2010-12-16difftool: provide basename to external toolsMichael J Gruber
2010-12-16git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber
2010-11-05docs: clarify git diff modes of operationJeff King
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2010-01-10difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-04-08difftool: add support for a difftool.prompt config variableDavid Aguilar
2009-04-08difftool: move 'git-difftool' out of contribDavid Aguilar