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

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.
main
sudo pacman -Syu 2022-09-13 16:24:45 +07:00
parent 480a663df5
commit b4364cff8c
No known key found for this signature in database
GPG Key ID: D6CB5C6C567C47B0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/git.sh
View File

@ -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