X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fgitconfig;h=c895618ef9e8ec899b5b130e64b5964c63e5cb18;hb=b833cf05a90761d75477120640eef90a38833a6a;hp=80b45a553e6eab4d2c38e437cb84576d6d9be341;hpb=344d30b264bdc41793939e884caae3464f3995c8;p=shutils.git

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 80b45a5..c895618 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -1,30 +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
-[mergetool "splice"]
-	cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
-	trustExitCode = true
-[merge]
-	tool = splice
+    editor = vi
+    pager = less -FXRS -x4
+[init]
+    defaultBranch = main
 [push]
-	default = simple
+    default = simple
+[pull]
+    rebase = true
+[status]
+    #submodulesummary = true ; reduces speed of 'git status'
 [alias]
-	wdiff = diff --color-words
-	wlog = log --color-words
+    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'
\ No newline at end of file
+    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'"