update git config

home/.gitconfig

@@ -42,6 +42,7 @@
 
 [difftool "sourcetree"]
 	cmd = code-insiders --diff --wait \"$LOCAL\" \"$REMOTE\"
+	path =
 [mergetool "sourcetree"]
 	cmd = code-insiders -n --wait \"$MERGED\"
 	trustExitCode = true
@@ -55,6 +56,7 @@
 	ll = log --graph --pretty=oneline --abbrev-commit
 	lll = "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"
 	a = add
+	an = annex
 	d = diff
 	p = push
 	po = push origin
@@ -73,8 +75,10 @@
 	smtpServer = mail.0l.de
 	smtpUser = stv0g
 	smtpServerPort = 587
+[pull]
+	rebase = false
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
-	required = true
 	process = git-lfs filter-process
+	required = true