update

2 files changed, 8 insertions, 6 deletions

diff --git a/.bash_aliases b/.bash_aliases
index e488a3f..5f054d6 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -22,6 +22,7 @@ alias commit='git commit'
 alias branch='git branch'
 alias pull='git pull'
 alias fetch='git fetch'
+alias merge='git merge'
 
 # docker
 alias dp='docker ps'
@@ -53,8 +54,6 @@ alias x='xdg-open'
 alias f='free -h'
 alias yl='youtube-dl'
 alias raw='echo "https://raw.githubusercontent.com"'
-alias sshkey='curl $(raw)/typebrook/settings/master/blob/master/gcp | cat'
-alias sshgcp='curl $(raw)/typebrook/settings/master/blob/master/gcp > ./gcp'
 
 # tmp
 alias geo='cd ~/git/geoBingAnWeb'
diff --git a/Makefile b/Makefile
index 4bf6f56..d3bce0f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 apply-alias:
-        rm ~/.bash_aliases
-        ln ./.bash_aliases ~/.bash_aliases
+        rm -f ~/.bash_aliases
+        ln -s `pwd`/.bash_aliases ~/.bash_aliases
 apply-vim:
-        rm ~/.vim_runtime/my_configs.vim
-        ln ./.vimrc ~/.vim_runtime/my_configs.vim
+        rm -f ~/.vim_runtime/my_configs.vim
+        ln -s `pwd`/.vimrc ~/.vim_runtime/my_configs.vim
+apply-tig:
+        rm -f ~/.tigrc
+        ln -s `pwd`/.tigrc ~/.tigrc
 push:
         git commit -am "update"
         git push