Skip to content

Commit 7f3f56c

Browse files
committed
inline word diff
1 parent 8854ea0 commit 7f3f56c

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
* [Ignore one file on commit (e.g. Changelog).](https://github.com/git-tips/tips#ignore-one-file-on-commit-eg-changelog)
6868
* [Stash changes before rebasing](https://github.com/git-tips/tips#stash-changes-before-rebasing)
6969
* [Fetch pull request by ID to a local branch](https://github.com/git-tips/tips#fetch-pull-request-by-id-to-a-local-branch)
70-
* [Show the most recent tag on the current branch](https://github.com/git-tips/tips#show-the-most-recent-tag-on-the-current-branch)
70+
* [Show the most recent tag on the current branch.](https://github.com/git-tips/tips#show-the-most-recent-tag-on-the-current-branch)
71+
* [Show inline word diff.](https://github.com/git-tips/tips#show-inline-word-diff)
7172

7273
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
7374
<!-- @doxie.inject end toc -->
@@ -474,10 +475,15 @@ __Alternatives:__
474475
git pull origin pull/<id>/head:<branch-name>
475476
```
476477

477-
## Show the most recent tag on the current branch
478+
## Show the most recent tag on the current branch.
478479
```sh
479480
git describe --tags --abbrev=0
480481
```
481482

483+
## Show inline word diff.
484+
```sh
485+
git diff --word-diff
486+
```
487+
482488
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
483489
<!-- @doxie.inject end -->

tips.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,11 @@
270270
"alternatives": ["git pull origin pull/<id>/head:<branch-name>"]
271271
},
272272
{
273-
"title": "Show the most recent tag on the current branch",
273+
"title": "Show the most recent tag on the current branch.",
274274
"tip": "git describe --tags --abbrev=0"
275+
},
276+
{
277+
"title": "Show inline word diff.",
278+
"tip": "git diff --word-diff"
275279
}
276280
]

0 commit comments

Comments
 (0)