From 080e1eee8063512ce6fee81ae2fac38725286453 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 6 Oct 2023 21:17:46 +0300
Subject: [PATCH] Small git config changes.
---
.config/git/config | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.config/git/config b/.config/git/config
index eb1e96c..4ed1cce 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,3 +1,6 @@
+[advice]
+ skippedCherryPicks = false
+
[apply]
whitespace = fix
@@ -13,7 +16,7 @@
dif = diff --color-words --ignore-all-space
empty-commit = commit --allow-empty
exec = "!${SHELL:-/bin/sh} -ic "
- ff = merge --no-edit --ff-only origin/HEAD
+ ff = merge --no-edit --ff-only
fixup = !cd "${GIT_PREFIX:-$PWD}" && git commit --fixup $(git last-commit)
forget = reset HEAD^
iec = commit --allow-empty --only --message \"Initial empty commit.\"
--
GitLab