2020-06-27 20:33:13 +01:00
|
|
|
# git difftool
|
|
|
|
|
|
2021-03-06 20:31:47 +00:00
|
|
|
> Show file changes using external diff tools. Accepts the same options and arguments as `git diff`.
|
|
|
|
|
> See also: `git diff`.
|
2020-06-27 20:33:13 +01:00
|
|
|
> More information: <https://git-scm.com/docs/git-difftool>.
|
|
|
|
|
|
|
|
|
|
- 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}}`
|
