From 161874a65d34df05eb08fa3f63aa54d1bfa3a602 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Wed, 7 Jan 2026 14:26:36 +0100 Subject: gitconfig funktioniert nun auch mit beruflichen Repos --- git/config | 32 ++++++++++++++++++++++++++++++++ git/config-up2parts | 3 +++ git/gitconfig | 29 ----------------------------- install.sh | 2 +- 4 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 git/config create mode 100644 git/config-up2parts delete mode 100644 git/gitconfig diff --git a/git/config b/git/config new file mode 100644 index 0000000..778e580 --- /dev/null +++ b/git/config @@ -0,0 +1,32 @@ +[user] + email = ts@its1.de + name = Thomas Schmucker + +[includeIf "gitdir:~/**/up2parts-*/"] + path = ~/.config/git/config-up2parts + +[init] + defaultBranch = master + +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + light = false + navigate = true + side-by-side = true + line-numbers = true + tabs = 4 + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default + +[alias] + lg = log --color --graph --pretty=format:'%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches + diff --git a/git/config-up2parts b/git/config-up2parts new file mode 100644 index 0000000..181d750 --- /dev/null +++ b/git/config-up2parts @@ -0,0 +1,3 @@ +[user] + email = thomas.schmucker@up2parts.com + diff --git a/git/gitconfig b/git/gitconfig deleted file mode 100644 index 7037c8f..0000000 --- a/git/gitconfig +++ /dev/null @@ -1,29 +0,0 @@ -[user] - email = ts@its1.de - name = Thomas Schmucker - -[init] - defaultBranch = master - -[core] - pager = delta - -[interactive] - diffFilter = delta --color-only - -[delta] - light = false - navigate = true - side-by-side = true - line-numbers = true - tabs = 4 - -[merge] - conflictstyle = diff3 - -[diff] - colorMoved = default - -[alias] - lg = log --color --graph --pretty=format:'%C(magenta)%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches - diff --git a/install.sh b/install.sh index 4d61ce6..4095b2d 100755 --- a/install.sh +++ b/install.sh @@ -28,7 +28,7 @@ link_gdb() { } link_gitconfig() { - link "$SCRIPT_DIR/git/gitconfig" "$HOME/.gitconfig" + link "$SCRIPT_DIR/git" "$CONFIG/git" } link_mailcap() { -- cgit v1.3