summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
AgeCommit message (Expand)AuthorFilesLines
2021-02-22difftool.c: learn a new way start at specified fileLibravatar ZheNing Hu1-0/+8
2019-05-13difftool: fallback on merge.guitoolLibravatar Denton Liu1-1/+3
2017-02-08Document the --no-gui option in difftoolLibravatar Denton Liu1-2/+3
2016-06-28doc: typeset long command-line options as literalLibravatar Matthieu Moy1-1/+1
2014-10-28difftool: add support for --trust-exit-codeLibravatar David Aguilar1-0/+14
2013-05-17documentation: trivial style cleanupsLibravatar Felipe Contreras1-2/+1
2013-03-14difftool --dir-diff: symlink all files matching the working treeLibravatar John Keeping1-1/+3
2013-03-14git-difftool(1): fix formatting of --symlink descriptionLibravatar John Keeping1-2/+2
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-1/+1
2012-08-10mergetool,difftool: Document --tool-help consistentlyLibravatar David Aguilar1-3/+3
2012-07-23difftool: Use symlinks when diffing against the worktreeLibravatar David Aguilar1-0/+8
2012-04-23difftool: print list of valid tools with '--tool-help'Libravatar Tim Henigan1-5/+6
2012-04-23difftool: teach difftool to handle directory diffsLibravatar Tim Henigan1-0/+6
2012-03-15Documentation/difftool: add deltawalker to list of valid diff toolsLibravatar Tim Henigan1-2/+3
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Libravatar Thomas Hochstein1-1/+1
2011-07-06Documentation: use [verse] for SYNOPSIS sectionsLibravatar Martin von Zweigbergk1-0/+1
2011-03-19Merge branch 'ss/mergetool--lib'Libravatar Junio C Hamano1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-9/+0
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupLibravatar Sebastian Schuberth1-2/+2
2010-12-16Merge branch 'maint'Libravatar Junio C Hamano1-2/+4
2010-12-16difftool: provide basename to external toolsLibravatar Michael J Gruber1-0/+1
2010-12-16git-difftool.txt: correct the description of $BASE and describe $MERGEDLibravatar Michael J Gruber1-2/+3
2010-11-05docs: clarify git diff modes of operationLibravatar Jeff King1-1/+2
2010-11-05diff,difftool: Don't use the {0,2} notation in usage stringsLibravatar Štěpán Němec1-1/+1
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Libravatar Junio C Hamano1-8/+8
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'Libravatar David Aguilar1-1/+2
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-8/+8
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdLibravatar David Aguilar1-0/+5
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolLibravatar David Aguilar1-0/+9
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionLibravatar Scott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeLibravatar David Aguilar1-1/+1
2009-04-07difftool: add support for a difftool.prompt config variableLibravatar David Aguilar1-1/+9
2009-04-07difftool: move 'git-difftool' out of contribLibravatar David Aguilar1-0/+97
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:08:05 +0000