From 4eac165cb36a569302a154bec8b7d752d69d99db Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Thu, 4 May 2023 23:58:11 +0200
Subject: [PATCH] Update git config

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

diff --git a/.gitconfig b/.gitconfig
index 68cb33a..eeb3f15 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,6 +11,7 @@
   d = diff
   dc = diff --cached
   a = add
+  ap = add -p
   cm = commit -m
   l = log --pretty=format:"(%an)\\ \\ %h\\ \\ %ad\\ \\ %s" --date=short
   s = status -s
@@ -58,3 +59,7 @@
 
 [credential "https://github.com"]
   helper = !/usr/bin/gh auth git-credential
+
+[merge]
+  tool = vimdiff
+  conflictstyle = diff3