File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -78,6 +78,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
78
78
* [ Fetch pull request by ID to a local branch] ( #fetch-pull-request-by-id-to-a-local-branch )
79
79
* [ Show the most recent tag on the current branch.] ( #show-the-most-recent-tag-on-the-current-branch )
80
80
* [ Show inline word diff.] ( #show-inline-word-diff )
81
+ * [ Show changes using common diff tools.] ( #show-changes-using-common-diff-tools )
81
82
* [ Don’t consider changes for tracked file.] ( #dont-consider-changes-for-tracked-file )
82
83
* [ Undo assume-unchanged.] ( #undo-assume-unchanged )
83
84
* [ Clean the files from ` .gitignore ` .] ( #clean-the-files-from-gitignore )
@@ -634,6 +635,11 @@ git describe --tags --abbrev=0
634
635
git diff --word-diff
635
636
```
636
637
638
+ ## Show changes using common diff tools.
639
+ ``` sh
640
+ git difftool -t < commit1> < commit2> < path>
641
+ ```
642
+
637
643
## Don’t consider changes for tracked file.
638
644
``` sh
639
645
git update-index --assume-unchanged < file_name>
Original file line number Diff line number Diff line change 238
238
}, {
239
239
"title" : " Show inline word diff." ,
240
240
"tip" : " git diff --word-diff"
241
+ }, {
242
+ "title" : " Show changes using common diff tools." ,
243
+ "tip" : " git difftool -t <commit1> <commit2> <path>"
241
244
}, {
242
245
"title" : " Don’t consider changes for tracked file." ,
243
246
"tip" : " git update-index --assume-unchanged <file_name>"
You can’t perform that action at this time.
0 commit comments