knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #110 from adityasiwan/master 

Add tip to use common diff tools
This commit is contained in:
hemanth.hm 2016-07-09 15:41:45 +05:30 committed by GitHub
parent 596941ca4d 028da4a0c3
commit 996de6a5a3
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -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>

3
tips.json
View File

@ -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>"