Skip to content

Commit 028da4a

Browse files
committed
Add tip to use common diff tools
1 parent 596941c commit 028da4a

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
7878
* [Fetch pull request by ID to a local branch](#fetch-pull-request-by-id-to-a-local-branch)
7979
* [Show the most recent tag on the current branch.](#show-the-most-recent-tag-on-the-current-branch)
8080
* [Show inline word diff.](#show-inline-word-diff)
81+
* [Show changes using common diff tools.](#show-changes-using-common-diff-tools)
8182
* [Don’t consider changes for tracked file.](#dont-consider-changes-for-tracked-file)
8283
* [Undo assume-unchanged.](#undo-assume-unchanged)
8384
* [Clean the files from `.gitignore`.](#clean-the-files-from-gitignore)
@@ -634,6 +635,11 @@ git describe --tags --abbrev=0
634635
git diff --word-diff
635636
```
636637

638+
## Show changes using common diff tools.
639+
```sh
640+
git difftool -t <commit1> <commit2> <path>
641+
```
642+
637643
## Don’t consider changes for tracked file.
638644
```sh
639645
git update-index --assume-unchanged <file_name>

tips.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@
238238
}, {
239239
"title": "Show inline word diff.",
240240
"tip": "git diff --word-diff"
241+
}, {
242+
"title": "Show changes using common diff tools.",
243+
"tip": "git difftool -t <commit1> <commit2> <path>"
241244
}, {
242245
"title": "Don’t consider changes for tracked file.",
243246
"tip": "git update-index --assume-unchanged <file_name>"

0 commit comments

Comments
 (0)