summaryrefslogtreecommitdiff
path: root/config/essentials/git
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2024-06-06 15:29:58 +0200
committerRaymaekers Luca <raymaekers.luca@gmail.com>2024-06-06 15:29:58 +0200
commitad05cb18f03f3a97a918e090c38ba760147a0bb6 (patch)
tree233097b3ccbf1a4fef18a291d0d8fda3fba34c03 /config/essentials/git
parent1a7e35285abb5db60d2e1544ce0100e82c5d3490 (diff)
parent511b6c1bc9acd9e6029d08a6c448f6e0037755fb (diff)
Merge branch 'main' of db:dotfiles
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 2e3033d..ba81b18 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -8,3 +8,7 @@
autosetupremote = true
[pull]
rebase = false
+[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 "