knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2024-12-23 02:28:58 +00:00
Code Issues Releases Activity

inline word diff

Browse Source
This commit is contained in:
Hemanth.HM 2015-12-18 20:56:55 +05:30
parent 8854ea08c3
commit 7f3f56c62e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -67,7 +67,8 @@
* [Ignore one file on commit (e.g. Changelog).](https://github.com/git-tips/tips#ignore-one-file-on-commit-eg-changelog) * [Ignore one file on commit (e.g. Changelog).](https://github.com/git-tips/tips#ignore-one-file-on-commit-eg-changelog)
* [Stash changes before rebasing](https://github.com/git-tips/tips#stash-changes-before-rebasing) * [Stash changes before rebasing](https://github.com/git-tips/tips#stash-changes-before-rebasing)
* [Fetch pull request by ID to a local branch](https://github.com/git-tips/tips#fetch-pull-request-by-id-to-a-local-branch) * [Fetch pull request by ID to a local branch](https://github.com/git-tips/tips#fetch-pull-request-by-id-to-a-local-branch)
* [Show the most recent tag on the current branch](https://github.com/git-tips/tips#show-the-most-recent-tag-on-the-current-branch) * [Show the most recent tag on the current branch.](https://github.com/git-tips/tips#show-the-most-recent-tag-on-the-current-branch)
* [Show inline word diff.](https://github.com/git-tips/tips#show-inline-word-diff)
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end toc --> <!-- @doxie.inject end toc -->
@ -474,10 +475,15 @@ __Alternatives:__
git pull origin pull/<id>/head:<branch-name> git pull origin pull/<id>/head:<branch-name>
``` ```
## Show the most recent tag on the current branch ## Show the most recent tag on the current branch.
```sh ```sh
git describe --tags --abbrev=0 git describe --tags --abbrev=0
``` ```
## Show inline word diff.
```sh
git diff --word-diff
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end --> <!-- @doxie.inject end -->

6
tips.json
View File

@ -270,7 +270,11 @@
"alternatives": ["git pull origin pull/<id>/head:<branch-name>"] "alternatives": ["git pull origin pull/<id>/head:<branch-name>"]
}, },
{ {
"title": "Show the most recent tag on the current branch", "title": "Show the most recent tag on the current branch.",
"tip": "git describe --tags --abbrev=0" "tip": "git describe --tags --abbrev=0"
},
{
"title": "Show inline word diff.",
"tip": "git diff --word-diff"
} }
] ]