[GIT] Slim delta, colorMoved, section hunk headers, wsdiff alias

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Fabian IsingandClaude Opus 5.5 committed 2026-10-20 12:34:53 +02:00
1 parent 015027ed3b
commit 6ec88700a6
2 files changed
+39 -15

No files matched your search

+6
View File
@@ -0,0 +1,6 @@
# hunk headers show the enclosing heading/section
*.md diff=markdown
gitconfig diff=ini
*.gitconfig diff=ini
*.ini diff=ini
*.toml diff=ini
+33 -15
View File
@@ -1,32 +1,33 @@
# This is Git's per-user configuration file. # This is Git's per-user configuration file.
[user] [user]
# Please adapt and uncomment the following lines: # Please adapt and uncomment the following lines:
name = Fabian Ising name = Fabian Ising
email = github@murgi.de email = github@murgi.de
[includeIf "hasconfig:remote.*.url:https://github.com/**"] [includeIf "hasconfig:remote.*.url:https://github.com/**"]
path = ~/dotfiles/gitconfig/github.gitconfig path = ~/dotfiles/gitconfig/github.gitconfig
[includeIf "hasconfig:remote.*.url:git@github.com/**"] [includeIf "hasconfig:remote.*.url:git@github.com/**"]
path = ~/dotfiles/gitconfig/github.gitconfig path = ~/dotfiles/gitconfig/github.gitconfig
[includeIf "hasconfig:remote.*.url:https://git.fh-muenster.de/**"] [includeIf "hasconfig:remote.*.url:https://git.fh-muenster.de/**"]
path = ~/dotfiles/gitconfig/fhms.gitconfig path = ~/dotfiles/gitconfig/fhms.gitconfig
[includeIf "hasconfig:remote.*.url:git@git.fh-muenster.de:*/**"] [includeIf "hasconfig:remote.*.url:git@git.fh-muenster.de:*/**"]
path = ~/dotfiles/gitconfig/fhms.gitconfig path = ~/dotfiles/gitconfig/fhms.gitconfig
[includeIf "hasconfig:remote.*.url:ssh://git@git.fh-muenster.de:*/**"] [includeIf "hasconfig:remote.*.url:ssh://git@git.fh-muenster.de:*/**"]
path = ~/dotfiles/gitconfig/fhms.gitconfig path = ~/dotfiles/gitconfig/fhms.gitconfig
[includeIf "hasconfig:remote.*.url:https://vcs.murgi.de/**"] [includeIf "hasconfig:remote.*.url:https://vcs.murgi.de/**"]
path = ~/dotfiles/gitconfig/murgi.gitconfig path = ~/dotfiles/gitconfig/murgi.gitconfig
[includeIf "hasconfig:remote.*.url:ssh://git@vcs.murgi.de:*/**"] [includeIf "hasconfig:remote.*.url:ssh://git@vcs.murgi.de:*/**"]
path = ~/dotfiles/gitconfig/murgi.gitconfig path = ~/dotfiles/gitconfig/murgi.gitconfig
[includeIf "hasconfig:remote.*.url:git@vcs.murgi.de:*/**"] [includeIf "hasconfig:remote.*.url:git@vcs.murgi.de:*/**"]
path = ~/dotfiles/gitconfig/murgi.gitconfig path = ~/dotfiles/gitconfig/murgi.gitconfig
[includeIf "hasconfig:remote.*.url:git@git-int.sit.fraunhofer.de:*/**"] [includeIf "hasconfig:remote.*.url:git@git-int.sit.fraunhofer.de:*/**"]
path = ~/dotfiles/gitconfig/sit.gitconfig path = ~/dotfiles/gitconfig/sit.gitconfig
[includeIf "hasconfig:remote.*.url:https://git-int.sit.fraunhofer.de/**"] [includeIf "hasconfig:remote.*.url:https://git-int.sit.fraunhofer.de/**"]
path = ~/dotfiles/gitconfig/sit.gitconfig path = ~/dotfiles/gitconfig/sit.gitconfig
[core] [core]
excludesfile = ~/dotfiles/.gitignore_global excludesfile = ~/dotfiles/.gitignore_global
pager = delta attributesfile = ~/dotfiles/gitconfig/attributes
pager = delta
[submodule] [submodule]
recurse = true recurse = true
[filter "lfs"] [filter "lfs"]
@@ -39,6 +40,23 @@ email = github@murgi.de
[pull] [pull]
rebase = true rebase = true
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
[diff]
colorMoved = default
[delta] [delta]
navigate = true navigate = true
; plain look: +/- markers, line backgrounds (auto light/dark), no syntax colors
keep-plus-minus-markers = true
syntax-theme = none
file-style = bold
file-decoration-style = none
hunk-header-style = file syntax
hunk-header-decoration-style = none
tabs = 4
line-numbers = true
line-numbers-left-format =
line-numbers-right-format = "{np:>4} "
[diff "ini"]
xfuncname = "^\\[.*\\]"
[alias]
wsdiff = -c pager.diff='less -R' -c color.diff.old='red reverse' -c color.diff.new='green reverse' diff --word-diff=color --word-diff-regex='[^[:space:]]+|[[:space:]]+'