From daacc5c866df546538851da60b7fcee5edf3eebf Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Mon, 22 Aug 2022 17:48:44 +0200
Subject: Git: diff3 and overview

---
 git/dot-gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'git')

diff --git a/git/dot-gitconfig b/git/dot-gitconfig
index a0da7d2..1827554 100644
--- a/git/dot-gitconfig
+++ b/git/dot-gitconfig
@@ -9,10 +9,12 @@
 	tool = nvimdiff
 [merge]
 	tool = nvimdiff
+	conflictStyle = diff3
 [push]
 	default = simple
 [alias]
 	lg = log --graph --oneline --decorate --all
+	overview = log --graph --oneline --decorate --all --simplify-by-decoration
 [pull]
 	ff = only
 [init]
-- 
cgit v1.2.3