Fixed dotfiles' names.

Also added setup vimdiff with git.
tdmanv · Dec 20, 2014 · cb1199c · cb1199c
1 parent cd3ac47
commit cb1199c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/gitconfig b/gitconfig
@@ -5,3 +5,7 @@
 	editor = vim
 [push]
 	default = simple
+[diff]
+	tool = vimdiff
+[difftool]
+	prompt = false
diff --git a/install.sh b/install.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ln -s ./dotfiles/.vimrc .
-ln -s ./dotfiles/.tmux.conf .
-ln -s ./dotfiles/.gitconfig .
-cat ./dotfiles/.bashrc >> .bashrc
+ln -s ./dotfiles/vimrc .vimrc  
+ln -s ./dotfiles/tmux.conf .tmux.conf 
+ln -s ./dotfiles/gitconfig .gitconfig 
+cat ./dotfiles/bashrc >> .bashrc
 git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
 vim +BundleInstall +qall
 sudo pip install git+git://github.com/Lokaltog/powerline