From 40daad461346d07fd63e24f98d8096dc7ae01547 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Date: Tue, 26 Dec 2023 16:10:57 +0700 Subject: [PATCH] chore(git): disable rebase --- scripts/git.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/git.sh b/scripts/git.sh index 51ccebb..396a9fd 100755 --- a/scripts/git.sh +++ b/scripts/git.sh @@ -29,6 +29,7 @@ git config --global diff.colorMoved no git config --global fetch.prune true git config --global init.defaultBranch main git config --global merge.conflictstyle diff3 +git config --global pull.rebase false git config --global pull.twohead ort git config --global push.autoSetupRemote true git config --global rebase.stat true