gitconfig: odds and ends

1 files changed, 2 insertions, 3 deletions

diff --git a/.gitconfig b/.gitconfig
index 05453ce..76c9a91 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,7 +16,6 @@
     type = cat-file -t
     dump = cat-file -p
     adog = log --all --decorate --oneline --graph
-    conflicted = !nvim +Conflicted
 [credential]
     helper = cache --timeout=3600
 [color]
@@ -40,6 +39,6 @@
     smtpserveroption = -a
     smtpserveroption = ceng_argor
 [pull]
-        ff = only
+    ff = only
 [init]
-        defaultBranch = main
+    defaultBranch = main