From 292a50aedf10f26720f57a4e0f4df96c6a3e0a8b Mon Sep 17 00:00:00 2001 From: jn64 <23169302+jn64@users.noreply.github.com> Date: Thu, 25 Jun 2020 15:04:57 +0800 Subject: [PATCH 1/2] git-difftool: add page --- 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 00000000000000..aa0dc305f0d0a6 --- /dev/null +++ b/pages/common/git-difftool.md @@ -0,0 +1,20 @@ +# git difftool + +> Show changes to files using external diff tools. Takes 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}}` From bb784051e79b73959d64ae90b161691198b01cb4 Mon Sep 17 00:00:00 2001 From: jn64 <23169302+jn64@users.noreply.github.com> Date: Fri, 26 Jun 2020 02:28:10 +0800 Subject: [PATCH 2/2] Update git-difftool.md --- pages/common/git-difftool.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/common/git-difftool.md b/pages/common/git-difftool.md index aa0dc305f0d0a6..4a0a7abd3c8314 100644 --- a/pages/common/git-difftool.md +++ b/pages/common/git-difftool.md @@ -1,6 +1,6 @@ # git difftool -> Show changes to files using external diff tools. Takes the same options and arguments as git diff. +> Show file changes using external diff tools. Accepts the same options and arguments as git diff. > More information: . - List available diff tools: