From cd2c7c2482ee9d95d942b7bbd565a3eae3b4ce70 Mon Sep 17 00:00:00 2001 From: Steve Mao Date: Thu, 20 Jul 2017 10:26:57 +1000 Subject: [PATCH 1/4] 1.1.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b0792a..1b60a84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { "name": "diff-so-fancy", - "version": "1.0.0", + "version": "1.1.1", "lockfileVersion": 1 } diff --git a/package.json b/package.json index f4f09fb..23fcf0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diff-so-fancy", - "version": "1.0.0", + "version": "1.1.1", "description": "Good-lookin' diffs with diff-highlight and more", "bin": { "diff-so-fancy": "diff-so-fancy" From c5fc60c30fa33286d0e62c245ce760bc4a7def3d Mon Sep 17 00:00:00 2001 From: Steve Mao Date: Tue, 1 Aug 2017 09:54:17 +1000 Subject: [PATCH 2/4] submit PR against the next branch --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 93a23af..9e365e2 100644 --- a/readme.md +++ b/readme.md @@ -73,7 +73,7 @@ git config --bool --global diff-so-fancy.useUnicodeRuler false ## Contributing -Pull requests quite welcome, along with any feedback or ideas. +Any feedback or ideas are welcome. Please submit your pull requests against the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). ### Other documentation From f29cb71fffa9d11de94311ff1555dc58ddcd46a6 Mon Sep 17 00:00:00 2001 From: Steve Mao Date: Wed, 2 Aug 2017 17:15:48 +1000 Subject: [PATCH 3/4] wording copied from 7d6549e29abcfc5408bd3a2c037ab137e3252fe2 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 9e365e2..33e0694 100644 --- a/readme.md +++ b/readme.md @@ -73,7 +73,7 @@ git config --bool --global diff-so-fancy.useUnicodeRuler false ## Contributing -Any feedback or ideas are welcome. Please submit your pull requests against the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). +Pull requests are quite welcome, and should target the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). We are also looking for any feedback or ideas on how to make diff-so-fancy even better. ### Other documentation From e8be2f335f7f2c20d60f562951093e97abbfaff3 Mon Sep 17 00:00:00 2001 From: Matt <32581276+mehandes@users.noreply.github.com> Date: Sat, 14 Oct 2017 19:48:52 +0200 Subject: [PATCH 4/4] Added additional way of obtaining the package added Nix package manager option --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 33e0694..4544cc4 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ Vanilla `git diff` vs `git` and `diff-so-fancy` Installation is as simple as downloading the [diff-so-fancy](https://raw.githubusercontent.com/so-fancy/diff-so-fancy/master/third_party/build_fatpack/diff-so-fancy) script to a directory in your path -`diff-so-fancy` is also available from NPM, brew, and as a package on Arch Linux. +`diff-so-fancy` is also available from NPM, Nix, brew, and as a package on Arch Linux. ## Usage