From e05ce1a320750bb6adda1985542c44675334161b Mon Sep 17 00:00:00 2001
From: Yigit Sever
Date: Tue, 12 Oct 2021 00:01:18 +0300
Subject: gitconfig: odds and ends

---
 .gitconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.gitconfig')

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
-- 
cgit v1.2.3-70-g09d2