summaryrefslogtreecommitdiff
path: root/config/essentials/git
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2024-05-27 14:19:09 +0200
committerRaymaekers Luca <raymaekers.luca@gmail.com>2024-05-27 14:19:09 +0200
commitf0dd78002892ace7c61521c6ceeb6660d391ca70 (patch)
treedb17be4927e4359cd1a5760a76c11c6182429a78 /config/essentials/git
parentf32fc8b9eb8303d1ca2e1cc17773bc44d38fff3d (diff)
parentf073720476b2bc19346049e4f2c774469289410f (diff)
Merge remote-tracking branch 'origin/main'
Diffstat (limited to 'config/essentials/git')
-rw-r--r--config/essentials/git/config4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index fcf80db..cb16983 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -10,3 +10,7 @@
rebase = false
[commit]
gpgsign = true
+[merge]
+ ff = false
+[alias]
+ change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;}; f "