summaryrefslogtreecommitdiff
path: root/config/essentials
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2024-06-22 13:51:05 +0200
committerRaymaekers Luca <raymaekers.luca@gmail.com>2024-06-22 13:51:05 +0200
commitdb762fb33867d78d33d98e7ded0981a9caa52d41 (patch)
tree63b4b147274293f3afd744e5aa4234bde0a05c48 /config/essentials
parent30f72f36d20e9757eddcd71301403920779f31d6 (diff)
ff true
Diffstat (limited to 'config/essentials')
-rw-r--r--config/essentials/git/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index 99cf21e..2b2b202 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -9,7 +9,7 @@
[pull]
rebase = false
[merge]
- ff = false
+ ff = true
[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 "
[commit]