forked from tldr-pages/tldr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-difftool: add page (tldr-pages#4127)
- Loading branch information
Showing
1 changed file
with
20 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}}` |