diff --git a/.config/git/config.aliases b/.config/git/config.aliases index e7db409..e775f75 100644 --- a/.config/git/config.aliases +++ b/.config/git/config.aliases @@ -15,10 +15,10 @@ daw = diff --word-diff # show diff by word dasw = diff --staged --word-diff - d = "!f() { git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"; }; f" - ds = "!f() { git diff --staged "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"; }; f" - dw = "!f() { git diff --word-diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"; }; f" - dsw = "!f() { git diff --staged --word-diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"; }; f" + d = "!f() { git diff "$@" ':(exclude)package-lock.json' ':(exclude)*.lock'; }; f" + ds = "!f() { git diff --staged "$@" ':(exclude)package-lock.json' ':(exclude)*.lock'; }; f" + dw = "!f() { git diff --word-diff "$@" ':(exclude)package-lock.json' ':(exclude)*.lock'; }; f" + dsw = "!f() { git diff --staged --word-diff "$@" ':(exclude)package-lock.json' ':(exclude)*.lock'; }; f" st = status --short --branch stu = status --short --branch -u diff --git a/.gitignore b/.gitignore index 3fc8b21..b1599df 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ data/ .config/qalculate/qalc.history .config/wireshark/ hackin/ +.config/fontforge/plugin/plugin_config.ini