Merge branch 'master' of github.com:so-fancy/diff-so-fancy

Author: scottchiefbaker

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.2.7",
   "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,7 +34,7 @@ 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