Merge pull request #395 from dotiful/patch-1

Update pro-tips.md

Author: scottchiefbaker

README.md

@@ -52,39 +52,39 @@ git config --global color.diff.whitespace "red reverse"
 
 Should the first block of an empty line be colored. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.markEmptyLines false
 ```
 
 ### changeHunkIndicators
 
 Simplify git header chunks to a more human readable format. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.changeHunkIndicators false
 ```
 
 ### stripLeadingSymbols
 
 Should the pesky `+` or `-` at line-start be removed. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.stripLeadingSymbols false
 ```
 
 ### useUnicodeRuler
 
 By default, the separator for the file header uses Unicode line-drawing characters. If this is causing output errors on your terminal, set this to `false` to use ASCII characters instead. (Default: true)
 
-```
+```shell
 git config --bool --global diff-so-fancy.useUnicodeRuler false
 ```
 
 ### rulerWidth
 
 By default, the separator for the file header spans the full width of the terminal. Use this setting to set the width of the file header manually.
 
-```
+```shell
 git config --global diff-so-fancy.rulerWidth 47    # git log's commit header width
 ```
 
@@ -109,6 +109,10 @@ Pull requests are quite welcome, and should target the [`next` branch](https://g
 * [Hacking and Testing](hacking-and-testing.md)
 * [History](history.md)
 
+## Alternatives
+
+* https://github.com/dandavison/delta
+
 ## License
 
 MIT

hacking-and-testing.md

@@ -33,4 +33,4 @@ You can lint your scripts via shellcheck, our CI bots will also check.
 
 ```sh
 brew install shellcheck
-shellcheck diff-so-fancy update-deps.sh
+shellcheck *.sh

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "diff-so-fancy",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "Good-lookin' diffs with diff-highlight and more",
   "bin": {
     "diff-so-fancy": "diff-so-fancy"

package.json

@@ -7,7 +7,7 @@ You can do also do a one-off or a specific `diff-so-fancy` alias:
 git diff --color | diff-so-fancy
 
 git config --global alias.dsf '!f() { [ -z "$GIT_PREFIX" ] || cd "$GIT_PREFIX" '\
-'&& git diff --color "$@" | diff-so-fancy  | less --tabs=4 -RFX; }; f'
+'&& git diff --color "$@" | diff-so-fancy  | less --tabs=4 -RFXS; }; f'
 ```
 
 #### Opting-out
@@ -34,19 +34,19 @@ You can pre-seed your `less` pager with a search pattern, so you can move
 between files with `n`/`N` keys:
 ```ini
 [pager]
-    diff = diff-so-fancy | less --tabs=4 -RFX --pattern '^(Date|added|deleted|modified): '
+    diff = diff-so-fancy | less --tabs=4 -RFXS --pattern '^(Date|added|deleted|modified): '
 ```
 
 #### Zsh plugin providing diff-so-fancy
 
 Zsh plugin [zdharma/zsh-diff-so-fancy](https://github.com/zdharma/zsh-diff-so-fancy) has this
 project as a submodule so installing the plugin installs `diff-so-fancy`. The plugin provides
-subcommand `git dsf` out of the box. Installation with Zplugin, Zplug and Zgen:
+subcommand `git dsf` out of the box. Installation with Zinit, Zplug and Zgen:
 
 ```zsh
-# Zplugin
-zplugin ice as"program" pick"bin/git-dsf"
-zplugin light zdharma/zsh-diff-so-fancy
+# zinit
+zinit ice lucid as"program" pick"bin/git-dsf"
+zinit load zdharma/zsh-diff-so-fancy
 
 # Or zplug
 zplug "zdharma/zsh-diff-so-fancy", as:command, use:bin/git-dsf