From 7f3f56c62ecc9568789f049ec37c7f825b50b009 Mon Sep 17 00:00:00 2001 From: "Hemanth.HM" Date: Fri, 18 Dec 2015 20:56:55 +0530 Subject: [PATCH] inline word diff --- README.md | 10 ++++++++-- tips.json | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 985c95b..269bfd7 100644 --- a/README.md +++ b/README.md @@ -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) * [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) -* [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) @@ -474,10 +475,15 @@ __Alternatives:__ git pull origin pull//head: ``` -## Show the most recent tag on the current branch +## Show the most recent tag on the current branch. ```sh git describe --tags --abbrev=0 ``` +## Show inline word diff. +```sh +git diff --word-diff +``` + diff --git a/tips.json b/tips.json index c2bb659..c708777 100644 --- a/tips.json +++ b/tips.json @@ -270,7 +270,11 @@ "alternatives": ["git pull origin pull//head:"] }, { - "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" + }, + { + "title": "Show inline word diff.", + "tip": "git diff --word-diff" } ]