Skip to content

Commit

Permalink
git-difftool: add page (tldr-pages#4127)
Browse files Browse the repository at this point in the history
  • Loading branch information
jn64 authored Jun 27, 2020
1 parent 4b76fff commit 7a9754b
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions pages/common/git-difftool.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# git difftool

> Show file changes using external diff tools. Accepts the same options and arguments as git diff.
> 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}}`

0 comments on commit 7a9754b

Please sign in to comment.