Skip to content

Commit

Permalink
Add and globally configure git-delta
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackjacx committed Sep 13, 2024
1 parent 7246cd4 commit 6941395
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions bootstrap/dotfiles/.Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ brew "fx" # 🔥 interactive terminal JS
brew "gh"
brew "ghostscript" # needed inconjunction with imagemagick to convert pdf > png (conversion of PDF app icons from UX to PNG automatically)
brew "git" # distributed version-control system for tracking changes in source code during software development
brew "git-delta" # A syntax-highlighting pager for git, diff, grep, and blame output
brew "git-extras"
brew "git-flow"
brew "github-markdown-toc"
Expand Down
14 changes: 13 additions & 1 deletion bootstrap/dotfiles/.gitconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
[core]
excludesfile = ~/.gitignore
mergeoptions = --no-edit
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections

# delta detects terminal colors automatically; set one of these to disable auto-detection
# dark = true
# light = true
[diff]
colorMoved = default
[merge]
ff = only
conflictstyle = diff3
[user]
name = Stefan Herold
email = [email protected]
Expand Down Expand Up @@ -34,7 +46,7 @@
[init]
defaultBranch = main
[pager]
diff = false
diff = true
log = true
[fetch]
prune = true

0 comments on commit 6941395

Please sign in to comment.