diff options
| author | Miguel <m.i@gmx.at> | 2021-11-10 14:41:11 +0100 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2021-11-10 14:41:11 +0100 |
| commit | b633c0785f7e43899b51692bf04f556c2d6c0fe5 (patch) | |
| tree | 4624223bf32c0d2b5d844d72aca4681a2594e8e1 /git/.gitconfig | |
| parent | e86d9f569e27dadebc246da8818f28bbce43ddd1 (diff) | |
add git-delta and tune tmux
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/git/.gitconfig b/git/.gitconfig deleted file mode 100644 index ff10baa..0000000 --- a/git/.gitconfig +++ /dev/null @@ -1,21 +0,0 @@ -[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 - |