From f6e4d07de37555c8c68ac8412d55123c04d658da Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 29 Dec 2021 16:46:12 +0100 Subject: [PATCH] dotfiles: Update gitconfig --- dotfiles/gitconfig | 63 ++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index c8aec3b..c895618 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -1,33 +1,46 @@ [user] - name = Stefan Huber - email = me@example.com - signingkey = 0123456 + name = Stefan Huber + email = me@example.com + signingkey = 0123456 [http] - #prxy = http://username:password@192.168.9.10:8080 + #prxy = http://username:password@192.168.9.10:8080 [color] - ui = auto - status = auto - branch = auto - diff = auto - interactive = auto + ui = auto + status = auto + branch = auto + diff = auto + interactive = auto [core] - editor = vim - pager = less -FXRS -x4 -[merge] - tool = splice -[mergetool "splice"] - cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" - trustExitCode = true + editor = vi + pager = less -FXRS -x4 +[init] + defaultBranch = main +[push] + default = simple +[pull] + rebase = true +[status] + #submodulesummary = true ; reduces speed of 'git status' [alias] - wdiff = diff -w --word-diff-regex="[^[:space:]]" - wlog = log -w --word-diff-regex="[^[:space:]]" - wshow = show -w --word-diff-regex="[^[:space:]]" + wdiff = diff -w --word-diff-regex="[^[:space:]]" + wlog = log -w --word-diff-regex="[^[:space:]]" + wshow = show -w --word-diff-regex="[^[:space:]]" [log] decorate [diff] - renames = true - submodule = log -[status] - #submodulesummary = true ; reduces speed of 'git status' -[push] - default = simple + renames = true + submodule = log + tool = nvimdiff +[difftool] + prompt = false +[difftool "nvimdiff"] + cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"" +[merge] + tool = nvimdiff +[mergetool] + prompt = true +[mergetool "splice"] + cmd = "vi -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'SpliceInit'" + trustExitCode = true +[mergetool "nvimdiff"] + cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'" -- 2.39.5