knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2024-06-11 14:42:26 +00:00
Code Issues Releases Activity

Merge pull request #156 from 0xmohit/fix-difftool-ex

Browse Source 
Fix difftool example
This commit is contained in:
hemanth.hm 2017-12-25 11:00:19 +05:30 committed by GitHub
commit 8b613e09f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -728,7 +728,7 @@ git diff --word-diff
## Show changes using common diff tools. ## Show changes using common diff tools.
```sh ```sh
git difftool -t <commit1> <commit2> <path> git difftool [-t <tool>] <commit1> <commit2> <path>
``` ```
## Don’t consider changes for tracked file. ## Don’t consider changes for tracked file.

2
tips.json
View File

@ -257,7 +257,7 @@
"tip": "git diff --word-diff" "tip": "git diff --word-diff"
}, { }, {
"title": "Show changes using common diff tools.", "title": "Show changes using common diff tools.",
"tip": "git difftool -t <commit1> <commit2> <path>" "tip": "git difftool [-t <tool>] <commit1> <commit2> <path>"
}, { }, {
"title": "Don’t consider changes for tracked file.", "title": "Don’t consider changes for tracked file.",
"tip": "git update-index --assume-unchanged <file_name>" "tip": "git update-index --assume-unchanged <file_name>"