From 028da4a0c3527ecc463ec8bfc69757cc90c4a9f6 Mon Sep 17 00:00:00 2001
From: Aditya Harsh <harsh.aditya14@stu.upes.ac.in>
Date: Thu, 7 Jul 2016 19:12:54 +0530
Subject: [PATCH] Add tip to use common diff tools

---
 README.md | 6 ++++++
 tips.json | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 98ca3f2..8e15921 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`.
 * [Fetch pull request by ID to a local branch](#fetch-pull-request-by-id-to-a-local-branch)
 * [Show the most recent tag on the current branch.](#show-the-most-recent-tag-on-the-current-branch)
 * [Show inline word diff.](#show-inline-word-diff)
+* [Show changes using common diff tools.](#show-changes-using-common-diff-tools)
 * [Don’t consider changes for tracked file.](#dont-consider-changes-for-tracked-file)
 * [Undo assume-unchanged.](#undo-assume-unchanged)
 * [Clean the files from `.gitignore`.](#clean-the-files-from-gitignore)
@@ -634,6 +635,11 @@ git describe --tags --abbrev=0
 git diff --word-diff
 ```
 
+## Show changes using common diff tools.
+```sh
+git difftool -t <commit1> <commit2> <path>
+```
+
 ## Don’t consider changes for tracked file.
 ```sh
 git update-index --assume-unchanged <file_name>
diff --git a/tips.json b/tips.json
index 3c1bcab..d730120 100644
--- a/tips.json
+++ b/tips.json
@@ -238,6 +238,9 @@
 }, {
     "title": "Show inline word diff.",
     "tip": "git diff --word-diff"
+}, {
+    "title": "Show changes using common diff tools.",
+    "tip": "git difftool -t <commit1> <commit2> <path>"
 }, {
     "title": "Don’t consider changes for tracked file.",
     "tip": "git update-index --assume-unchanged <file_name>"