From 26d3ecf2ed2648635959aca33cff822a1769c466 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Thu, 15 Nov 2018 11:53:57 +0800
Subject: update

---
 .bash_aliases | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.bash_aliases')

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'
-- 
cgit v1.2.3-70-g09d2