Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions tips.json
Original file line number Diff line number Diff line change
Expand Up @@ -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>"
Expand Down