scripts
/
automate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set vimdiff as the merge tool.

This commit is contained in:
Cyteen 2017-11-25 17:57:41 +00:00
parent 1d8beccd98
commit 8b96b566d0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
010_git-aliases.sh
View File

@ -6,3 +6,8 @@ git config --global alias.lg "log --oneline --abbrev-commit --all --graph --deco
# see the problems with git pull: https://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful/15316602#15316602
git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'
# set vimdiff as the merge tool.
git config --global merge.tool vimdiff
git config --global merge.conflictstyle diff3
git config --global mergetool.prompt false