Merge branch 'master' of github.com:ntietz/config
This commit is contained in:
commit
f857d8b261
2 changed files with 5 additions and 1 deletions
1
.gitmodules
vendored
Normal file
1
.gitmodules
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -14,6 +14,9 @@ rm -f .vimrc
|
||||||
ln -s ~/Repositories/config/vimrc .vimrc
|
ln -s ~/Repositories/config/vimrc .vimrc
|
||||||
|
|
||||||
# set up the default branch for git
|
# set up the default branch for git
|
||||||
git config --global branch.master.remote origin
|
git config --global branch.master.remote github
|
||||||
git config --global branch.master.merge refs/heads/master
|
git config --global branch.master.merge refs/heads/master
|
||||||
|
|
||||||
|
rm -rf .vim
|
||||||
|
ln -s ~/Repositories/config/vim .vim
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue