From 2dbe19744996903794b1440ca29419d4ebb8a48c Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Wed, 25 Sep 2013 18:54:37 -0400 Subject: [PATCH] Aliases updates --- zsh/aliases | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zsh/aliases b/zsh/aliases index 3d3071b..e75d686 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -64,8 +64,8 @@ alias zsh='vim ~/.zshrc' # Git alias ammend='amend' alias amend='git commit --amend' -alias gaa='echo "Use ga!" && git add -A :/' -alias ga='git add -A :/' +alias gaa='git add -A :/' +alias ga='git add -A' alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed alias gau='git add --update' alias gb='git branch' @@ -92,6 +92,7 @@ alias gmff='git merge --ff-only' alias gmtheirs='git merge -Xtheirs' alias gp='git push' alias gpf='git push -f' +alias gpu='git push -u' alias gpff='git pull --ff-only' alias gpl='git pull' alias gpom='git push origin master' @@ -100,6 +101,7 @@ alias gr='git reset' alias grbm='git rebase master' alias grc='git rebase --continue' alias gre='git remote' +alias gref='git reflog' alias grev='git remote -v' alias grm='git rm' alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"' @@ -116,7 +118,7 @@ alias todo='vim ~/Dropbox/notes/daily/todo' alias sharp='vim ~/Dropbox/notes/sharpening-notes' alias completion='cd ~/Dropbox/notes/daily/daily-log/completion-list' alias log='cd ~/Dropbox/notes/daily/daily-log' -alias powerup='vim ~/code/learning-area/notes/powerup' +alias powerup='vim ~/Dropbox/notes/code/powerup' alias notes='cd ~/Dropbox/notes' alias daily='cd ~/Dropbox/notes/daily' alias guide='vim ~/Dropbox/notes/daily/DAILY_GUIDE' @@ -125,6 +127,7 @@ alias bucket='cd ~/Dropbox/notes/buckets' # Projects alias projects='cd ~/code/projects' +alias websites='cd ~/code/projects/websites' alias dot='cd ~/code/projects/dotfiles' alias work='cd ~/code/work' alias learn='cd ~/code/learning-area'