Skip to content

Commit

Permalink
Don't configure git for delta on debian
Browse files Browse the repository at this point in the history
  • Loading branch information
oalders committed Nov 18, 2023
1 parent f144f0a commit 1aeb0ba
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions configure/git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ git config --global alias.view-stash 'stash show -p stash@{0}'
git config --global color.ui auto
git config --global core.excludesfile ~/.gitignore_global

# configure delta as git's pager
git config --global core.pager 'delta'
git config --global delta.light false
git config --global delta.navigate true
git config --global diff.colorMoved default
git config --global interactive.diffFilter 'delta --color-only'
git config --global merge.conflictStyle diff3
if is os name ne debian; then
# configure delta as git's pager
git config --global core.pager 'delta'
git config --global delta.light false
git config --global delta.navigate true
git config --global diff.colorMoved default
git config --global interactive.diffFilter 'delta --color-only'
git config --global merge.conflictStyle diff3
fi

# takes a commit name as sole arg
git config --global alias.whatis "show -s --pretty='tformat:%h (%s, %ad)' --date=short"
Expand Down

0 comments on commit 1aeb0ba

Please sign in to comment.