From 94ef8b578631eb3477e686f673a64d5b45617268 Mon Sep 17 00:00:00 2001
From: Viyurz <128215328+Viyurz@users.noreply.github.com>
Date: Sun, 8 Oct 2023 09:48:21 +0200
Subject: [PATCH] Added branch/b alias + merge options

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

diff --git a/.gitconfig b/.gitconfig
index 77359ed..f2e9775 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,7 +14,12 @@
 [diff]
 	colorMoved = zebra
 [alias]
+	b = branch
 	c = commit
 	chk = checkout
 	l = log
 	s = status
+[merge]
+	ff = no
+	commit = no
+	conflictstyle = diff3