Commit Graph

35 Commits (master)

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason 2a9dfdf260 difftool docs: de-duplicate configuration sections 3 months ago
ZheNing Hu 1c881026a1 difftool.c: learn a new way start at specified file 2 years ago
Denton Liu 6c22d715e7 difftool: fallback on merge.guitool 4 years ago
Denton Liu 56c2da57fe Document the --no-gui option in difftool 6 years ago
Matthieu Moy bcf9626a71 doc: typeset long command-line options as literal 7 years ago
David Aguilar 2b52123fcf difftool: add support for --trust-exit-code 8 years ago
Felipe Contreras 0460ed2c93 documentation: trivial style cleanups 10 years ago
John Keeping 02c56314aa difftool --dir-diff: symlink all files matching the working tree 10 years ago
John Keeping 8aa10d4a5b git-difftool(1): fix formatting of --symlink description 10 years ago
Thomas Ackermann 2de9b71138 Documentation: the name of the system is 'Git', not 'git' 10 years ago
David Aguilar 7a30747fba mergetool,difftool: Document --tool-help consistently 10 years ago
David Aguilar 1f22934575 difftool: Use symlinks when diffing against the worktree 10 years ago
Tim Henigan bf73fc212a difftool: print list of valid tools with '--tool-help' 11 years ago
Tim Henigan 7e0abcec10 difftool: teach difftool to handle directory diffs 11 years ago
Tim Henigan 79e0fe6348 Documentation/difftool: add deltawalker to list of valid diff tools 11 years ago
Thomas Hochstein 1e501a7c47 documentation fix: git difftool uses diff tools, not merge tools. 11 years ago
Martin von Zweigbergk 7791a1d9b9 Documentation: use [verse] for SYNOPSIS sections 12 years ago
Jeff King 48bb914ed6 doc: drop author/documentation sections from most pages 12 years ago
Sebastian Schuberth ffe6dc081a mergetool--lib: Add Beyond Compare 3 as a tool 12 years ago
Sebastian Schuberth aa03f60463 mergetool--lib: Sort tools alphabetically for easier lookup 12 years ago
Michael J Gruber 4a689afb03 difftool: provide basename to external tools 12 years ago
Michael J Gruber 51baceeec4 git-difftool.txt: correct the description of $BASE and describe $MERGED 12 years ago
Jeff King 49bd56a5f7 docs: clarify git diff modes of operation 12 years ago
Štěpán Němec 9edb8a0f7b diff,difftool: Don't use the {0,2} notation in usage strings 12 years ago
David Aguilar f47f1e2ce8 difftool: Add '-x' and as an alias for '--extcmd' 13 years ago
Thomas Rast 0b444cdb19 Documentation: spell 'git cmd' without dash throughout 13 years ago
David Aguilar 1c6f5b52b7 difftool: Allow specifying unconfigured commands with --extcmd 13 years ago
David Aguilar 4cefa495ca git-difftool: Add '--gui' for selecting a GUI tool 13 years ago
Scott Chacon c8998b4823 mergetool--lib: add p4merge as a pre-configured mergetool option 13 years ago
David Aguilar b6f0621a46 mergetool--lib: add support for araxis merge 14 years ago
David Aguilar a904392eae difftool: add support for a difftool.prompt config variable 14 years ago
David Aguilar afcbc8e7ec difftool: move 'git-difftool' out of contrib 14 years ago
Sebastian Pipping 1c0f3d224e difftool/mergetool: add diffuse as merge and diff tool 14 years ago
David Aguilar 8b7332221d difftool: add a -y shortcut for --no-prompt 14 years ago
David Aguilar 2464456a6a contrib/difftool: use a separate config namespace for difftool commands 14 years ago
Markus Heidelberg 384770a5e7 contrib/difftool: add support for Kompare 14 years ago
David Aguilar 507cfcbd81 difftool: fix documentation problems 14 years ago
David Aguilar 5c38ea31f3 contrib: add 'git difftool' for launching common merge tools 14 years ago