From 7a9754b18faf14db724e06796540c310d3b8558c Mon Sep 17 00:00:00 2001 From: jn64 <23169302+jn64@users.noreply.github.com> Date: Sun, 28 Jun 2020 03:33:13 +0800 Subject: [PATCH] git-difftool: add page (#4127) --- pages/common/git-difftool.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pages/common/git-difftool.md diff --git a/pages/common/git-difftool.md b/pages/common/git-difftool.md new file mode 100644 index 0000000000..4a0a7abd3c --- /dev/null +++ b/pages/common/git-difftool.md @@ -0,0 +1,20 @@ +# git difftool + +> Show file changes using external diff tools. Accepts the same options and arguments as git diff. +> More information: . + +- List available diff tools: + +`git difftool --tool-help` + +- Set the default diff tool to meld: + +`git config --global diff.tool "{{meld}}"` + +- Use the default diff tool to show staged changes: + +`git difftool --staged` + +- Use a specific tool (opendiff) to show changes since a given commit: + +`git difftool --tool={{opendiff}} {{commit}}`