mirror of
https://github.com/namibia/tips.git
synced 2025-01-23 07:08:27 +00:00
Merge pull request #156 from 0xmohit/fix-difftool-ex
Fix difftool example
This commit is contained in:
commit
8b613e09f4
@ -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.
|
||||||
|
@ -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>"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user