summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
Commit message (Expand)AuthorAgeFilesLines
* mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks2023-04-051-4/+6
* difftool docs: de-duplicate configuration sectionsÆvar Arnfjörð Bjarmason2022-09-071-23/+4
* difftool.c: learn a new way start at specified fileZheNing Hu2021-02-221-0/+8
* difftool: fallback on merge.guitoolDenton Liu2019-05-131-1/+3
* Document the --no-gui option in difftooldl/difftool-doc-no-gui-optionDenton Liu2017-02-081-2/+3
* doc: typeset long command-line options as literalMatthieu Moy2016-06-281-1/+1
* difftool: add support for --trust-exit-codeDavid Aguilar2014-10-281-0/+14
* documentation: trivial style cleanupsFelipe Contreras2013-05-171-2/+1
* difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-141-1/+3
* git-difftool(1): fix formatting of --symlink descriptionJohn Keeping2013-03-141-2/+2
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-1/+1
* mergetool,difftool: Document --tool-help consistentlyDavid Aguilar2012-08-101-3/+3
* difftool: Use symlinks when diffing against the worktreeDavid Aguilar2012-07-231-0/+8
* difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-231-5/+6
* difftool: teach difftool to handle directory diffsTim Henigan2012-04-231-0/+6
* Documentation/difftool: add deltawalker to list of valid diff toolsth/mergetools-deltawalkerTim Henigan2012-03-151-2/+3
* documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein2011-11-211-1/+1
* Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-061-0/+1
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-2/+2
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-1/+1
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-2/+2
* | doc: drop author/documentation sections from most pagesJeff King2011-03-111-9/+0
|/
* Merge branch 'maint'Junio C Hamano2010-12-161-2/+4
|\
| * difftool: provide basename to external toolsMichael J Gruber2010-12-161-0/+1
| * git-difftool.txt: correct the description of $BASE and describe $MERGEDMichael J Gruber2010-12-161-2/+3
* | docs: clarify git diff modes of operationJeff King2010-11-051-1/+2
* | diff,difftool: Don't use the {0,2} notation in usage stringsŠtěpán Němec2010-11-051-1/+1
|/
* Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-8/+8
|\
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-8/+8
* | difftool: Add '-x' and as an alias for '--extcmd'David Aguilar2010-01-151-1/+2
* | difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar2010-01-091-0/+5
* | git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar2010-01-031-0/+9
|/
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-1/+1
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-1/+1
* difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-1/+9
* difftool: move 'git-difftool' out of contribDavid Aguilar2009-04-071-0/+97
View Lorry Controller Status