mirror of
https://github.com/git-tips/tips.git
synced 2024-09-21 00:01:03 +02:00
Fix difftool example
The example currently reads: git difftool -t <commit1> <commit2> <path> This would cause `commit1` to be considered as the diff tool.
This commit is contained in:
parent
f5b193cfaa
commit
a7b9fbf3b1
|
@ -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…
Reference in New Issue
Block a user