yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(git): disable rebase

main
sudo pacman -Syu 2023-12-26 16:10:57 +07:00
parent b58d9640e0
commit 40daad4613
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/git.sh
View File

@ -29,6 +29,7 @@ git config --global diff.colorMoved no
git config --global fetch.prune true git config --global fetch.prune true
git config --global init.defaultBranch main git config --global init.defaultBranch main
git config --global merge.conflictstyle diff3 git config --global merge.conflictstyle diff3
git config --global pull.rebase false
git config --global pull.twohead ort git config --global pull.twohead ort
git config --global push.autoSetupRemote true git config --global push.autoSetupRemote true
git config --global rebase.stat true git config --global rebase.stat true