From 173773d85c4fe7765df609bcf1ae3ff4f8fb9f92 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Mon, 27 Mar 2023 12:03:41 +0200 Subject: GIT Konfiguration hinzugefügt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git/gitconfig | 22 ++++++++++++++++++++++ install.sh | 6 ++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 git/gitconfig diff --git a/git/gitconfig b/git/gitconfig new file mode 100644 index 0000000..58c34f1 --- /dev/null +++ b/git/gitconfig @@ -0,0 +1,22 @@ +[user] + email = ts@its1.de + name = Thomas Schmucker + +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + light = false + navigate = true + side-by-side = true + line-numbers = true + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default + diff --git a/install.sh b/install.sh index cfd8da7..0959a01 100755 --- a/install.sh +++ b/install.sh @@ -10,11 +10,13 @@ cp -R tmux "$CONFIG" cp -R nvim "$CONFIG" # zsh -mkdir -p "$CONFIG/zsh" - cp zsh/zshenv ~/.zshenv +mkdir -p "$CONFIG/zsh" cp zsh/zshrc "$CONFIG/zsh/.zshrc" cp zsh/aliases "$CONFIG/zsh/aliases" cp zsh/prompt "$CONFIG/zsh/prompt" +# git +cp git/gitconfig ~/.gitconfig + -- cgit v1.3