From cf4d2ea2b4a2e0ab6703396330f58d5db7fbe06a Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Tue, 16 Jul 2024 12:15:45 +0530 Subject: [PATCH] fish: conf.d/git-abbr: Set word diff option for git diff --- fish/.config/fish/conf.d/git-abbr.fish | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fish/.config/fish/conf.d/git-abbr.fish b/fish/.config/fish/conf.d/git-abbr.fish index 914ef43..c57f450 100644 --- a/fish/.config/fish/conf.d/git-abbr.fish +++ b/fish/.config/fish/conf.d/git-abbr.fish @@ -45,12 +45,12 @@ abbr gcount 'git shortlog -sn' abbr gcp 'git cherry-pick' abbr gcpa 'git cherry-pick --abort' abbr gcpc 'git cherry-pick --continue' -abbr gd 'git diff' -abbr gdca 'git diff --cached' -abbr gdcw 'git diff --cached --word-diff' -abbr gdct 'git diff --staged' +abbr gd 'git diff --word-diff=color' +abbr gdca 'git diff --word-diff=color --cached' +abbr gdcw 'git diff --word-diff=color --cached' +abbr gdct 'git diff --word-diff=color --staged' abbr gdT 'git diff-tree --no-commit-id --name-only -r' -abbr gdup 'git diff @{upstream}' +abbr gdup 'git diff --word-diff=color @{upstream}' abbr gf 'git fetch' abbr gfa 'git fetch --all --prune --tags -f' abbr gfo 'git fetch origin'