Merge stash

.gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Robert Kmieć
-	email = KmcR@viessmann.com
+	email = robert.r.kmiec@gmail.com
 [core]
 	editor = nvim
 	pager = delta
@@ -44,8 +44,6 @@
 [commit]
 	template = .gitmessage
 	verbose = false
-; [mergetool "vimdiff"]
-;		cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [submodule]
 	recurse = false
 	fetchJobs = 4
@@ -90,20 +88,54 @@
 [diff "markdown"]
 	xfuncname = "^#+.*$"
 [delta]
-	features = decorations
-	navigate = true
-	dark = true
-	side-by-side = true
-	line-numbers = true
-	hyperlinks = true
+	features = side-by-side line-numbers decorations
 	whitespace-error-style = 22 reverse
-	# colorMoved support
-	map-styles = bold purple => syntax magenta, bold cyan => syntax blue
-	true-color = always
+	navigate = true
+	; dark = true
+	; side-by-side = true
+	; line-numbers = true
+	; hyperlinks = true
+	; # colorMoved support
+	; map-styles = bold purple => syntax magenta, bold cyan => syntax blue
+	; true-color = always
 [delta "decorations"]
 	commit-decoration-style = bold yellow box ul
 	file-style = bold yellow ul
 	file-decoration-style = none
+[pull]
+	rebase = true
+[commit]
+	template = .gitmessage
+	verbose = false
+[init]
+	defaultBranch = master
+[advice]
+	detachedHead = false
+[submodule]
+	recurse = false
+[rerere]
+	enabled = true
+[column]
+	ui = auto
+[branch]
+	sort = -commiterdate
+[pull]
+	rebase = true
+[commit]
+  #template = .gitmessage
+	verbose = false
+[init]
+	defaultBranch = master
+[advice]
+	detachedHead = false
+[submodule]
+	recurse = false
+[rerere]
+	enabled = true
+[column]
+	ui = auto
+[branch]
+	sort = -commiterdate
 [maintenance]
 	repo = /home/kmcr/repos/hems/hemsmilsimulation
 [sendemail]