|
@@ -12,7 +12,7 @@ git config --global user.name "DricomDragon"
|
|
git config --global core.editor "vim"
|
|
git config --global core.editor "vim"
|
|
git config --global push.followTags true
|
|
git config --global push.followTags true
|
|
git config --global diff.tool vimdiff
|
|
git config --global diff.tool vimdiff
|
|
-git config --global core.excludesfile '~/.gitignore'
|
|
|
|
|
|
+git config --global core.excludesfile '~/.config/gitignore'
|
|
|
|
|
|
# Git two-ways merge tool (look for whiteinge/diffconflicts in vimrc)
|
|
# Git two-ways merge tool (look for whiteinge/diffconflicts in vimrc)
|
|
git config --global merge.tool diffconflicts
|
|
git config --global merge.tool diffconflicts
|
|
@@ -20,9 +20,3 @@ git config --global mergetool.diffconflicts.cmd 'vim -c DiffConflicts "$MERGED"
|
|
git config --global mergetool.diffconflicts.trustExitCode true
|
|
git config --global mergetool.diffconflicts.trustExitCode true
|
|
git config --global mergetool.keepBackup false
|
|
git config --global mergetool.keepBackup false
|
|
|
|
|
|
-# Copy global gitignore
|
|
|
|
-cp --link ./Templates/gitignore ~/.gitignore
|
|
|
|
-
|
|
|
|
-# Create GitWork
|
|
|
|
-mkdir --parents ~/GitWork/DricomDragon ~/GitWork/CNI ~/GitWork/TestOrg ~/GitWork/BotFactory
|
|
|
|
-
|
|
|