From e736d378b01fcbca1e882bcfde88537aa039abae Mon Sep 17 00:00:00 2001
From: mdsanima <marcinrozewski@gmail.com>
Date: Thu, 1 Feb 2024 16:47:32 +0100
Subject: [PATCH] fix: Updated Git config for simplified push and rebase pull

Configured git to use the `simple` pushing strategy and to rebase
instead of merge on pull, optimizing the workflow and reducing merge
conflicts. This setting makes push defaults safer and pull updates
cleaner by rebasing local changes on top of fetched commits.
---
 .gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index bfd190b..4b3b68e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,12 @@
 	editor = nvim
 	symlinks = true
 
+[push]
+	default = simple
+
+[pull]
+	rebase = true
+
 [alias]
 	st = status
 	ci = commit --verbose