From b4364cff8c3915f45f53bfa91c3139932d324225 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Date: Tue, 13 Sep 2022 16:24:45 +0700 Subject: [PATCH] chore(config): use git merge-ort https://github.blog/changelog/2022-09-12-merge-commits-now-created-using-the-merge-ort-strategy/#:~:text=merge%2Dort%20is%20a%20relatively,in%20the%20merge%2Drecursive%20strategy. --- scripts/git.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/git.sh b/scripts/git.sh index e4cc573..e9c0db1 100755 --- a/scripts/git.sh +++ b/scripts/git.sh @@ -16,12 +16,13 @@ git config --global alias.sw switch git config --global alias.tg "tag --sort=-version:refname" # Misc -git config --global pull.rebase true +git config --global core.fsmonitor true +git config --global diff.colorMoved default git config --global fetch.prune true git config --global init.defaultBranch main -git config --global diff.colorMoved default git config --global merge.conflictstyle diff3 -git config --global core.fsmonitor true +git config --global pull.rebase true +git config --global pull.twohead ort git config --global push.autoSetupRemote true # Delta