Skip to content

Commit 043bddb

Browse files
Merge branch 'master' of github.com:so-fancy/diff-so-fancy into next
2 parents 81b6d61 + 63568e8 commit 043bddb

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ Vanilla `git diff` vs `git` and `diff-so-fancy`
1212
## Install
1313

1414
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. You can check which directories are in your path with `echo $PATH`.
15+
Windows users may need to install the [Windows subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
1516

16-
`diff-so-fancy` is also available from NPM, brew, and as a package on Arch Linux.
17+
`diff-so-fancy` is also available from NPM, Nix, brew, and as a package on Arch Linux.
1718

1819
## Usage
1920

@@ -73,7 +74,7 @@ git config --bool --global diff-so-fancy.useUnicodeRuler false
7374

7475
## Contributing
7576

76-
Pull requests are quite welcome, and should target the `next` branch. We are also looking for any feedback or ideas on how to make diff-so-fancy even better.
77+
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.
7778

7879
### Other documentation
7980

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff-so-fancy",
3-
"version": "1.0.0",
3+
"version": "1.2.0",
44
"description": "Good-lookin' diffs with diff-highlight and more",
55
"bin": {
66
"diff-so-fancy": "diff-so-fancy"

pro-tips.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,22 @@ between files with `n`/`N` keys:
3636
[pager]
3737
diff = diff-so-fancy | less --tabs=4 -RFX --pattern '^(Date|added|deleted|modified): '
3838
```
39+
40+
#### Zsh plugin providing diff-so-fancy
41+
42+
Zsh plugin [zdharma/zsh-diff-so-fancy](https://github.com/zdharma/zsh-diff-so-fancy) has this
43+
project as a submodule so installing the plugin installs `diff-so-fancy`. The plugin provides
44+
subcommand `git dsf` out of the box. Installation with Zplugin, Zplug and Zgen:
45+
46+
```zsh
47+
# Zplugin
48+
zplugin ice as"program" pick"bin/git-dsf"
49+
zplugin light zdharma/zsh-diff-so-fancy
50+
51+
# Or zplug
52+
zplug "zdharma/zsh-diff-so-fancy", as:command, use:bin/git-dsf
53+
54+
# Or zgen and others
55+
zgen zdharma/zsh-diff-so-fancy
56+
```
57+

0 commit comments

Comments
 (0)