From b633c0785f7e43899b51692bf04f556c2d6c0fe5 Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 10 Nov 2021 14:41:11 +0100 Subject: add git-delta and tune tmux --- git/dot-gitconfig | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 git/dot-gitconfig (limited to 'git/dot-gitconfig') diff --git a/git/dot-gitconfig b/git/dot-gitconfig new file mode 100644 index 0000000..e5c0949 --- /dev/null +++ b/git/dot-gitconfig @@ -0,0 +1,29 @@ +[user] + name = Miguel + email = m.i@gmx.at + +[merge] + tool = vimdiff + conflictstyle = diff3 + +[mergetool] + prompt = true + +[mergetool "vimdiff"] + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J' + +[diff] + tool = nvimdiff + +[difftool "nvimdiff"] + cmd = "/root/nvim.appimage -d $LOCAL $REMOTE" + prompt = true + +[pager] + diff = delta + show = delta + log = delta + reflog = delta + +[interactive] + diffFilter = delta --color-only -- cgit v1.2.3