fix: alias, arch-updates (polybar)

add: vim mergetool

.config/git/config

@@ -8,7 +8,7 @@
 	pager = less
 	autocrlf = input
 [help]
-	autocorrect = 20
+	autocorrect = 10
 [diff]
 	tool = vimdiff
 [difftool]
@@ -18,12 +18,16 @@
     d = diff
     b = branch -vv
     logg = log --graph
+    logo = log --graph --decorate --oneline --all
     diffc = diff --cached
+
 [merge]
-	tool = vimdiff
-	conflictstyle = diff3
-[mergetool]
-    prompt = false
+    tool = vim_mergetool
+    conflictstyle = diff3
+[mergetool "vim_mergetool"]
+    cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+    trustExitCode = true
+
 [credential]
 	helper = /usr/bin/pass-git-helper
 [format]
@@ -33,3 +37,7 @@
 	smtpuser = tobias@msrg.cc
 	smtpencryption = tls
 	smtpserverport = 587
+[advice]
+	addIgnoredFile = false
+[pull]
+	ff = only