gitconfig for servers

server/.gitconfig

@@ -0,0 +1,36 @@
+[user]
+	name = Jon Gjengset
+	email = jon@thesquareplanet.com
+[ui "color"]
+	ui = always
+[color]
+	ui = true
+[core]
+	autocrlf = input
+	safecrlf = true
+[merge]
+	tool = nvim -d
+[alias]
+	c = commit
+	s = status
+	st = status
+	lg = log --oneline
+	last = log -1 HEAD
+	f = push --force-with-lease
+	# https://stackoverflow.com/a/11688523/472927
+	ss = "!f() { git stash show stash^{/$*} -p; }; f"
+	sa = "!f() { git stash apply stash^{/$*}; }; f"
+	sl = stash list
+[push]
+	default = simple
+[help]
+	autocorrect = 1
+[url "git@github.com:"]
+	insteadOf = gh:
+[github]
+	user = jonhoo
+[diff]
+	algorithm = patience
+	compactionHeuristic = true
+[protocol]
+	version = 2

shell/.gitconfig

@@ -11,7 +11,7 @@
 	autocrlf = input
 	safecrlf = true
 [merge]
-	tool = vimdiff
+	tool = nvim -d
 [alias]
 	c = commit
 	s = status