From f4c5a7dba25b4b7546e8d7bff92e4e12a0315dbf Mon Sep 17 00:00:00 2001
From: Rafael Regis <rafael.regisp@gmail.com>
Date: Thu, 17 Jan 2013 14:36:34 -0200
Subject: [PATCH 1/3] Remove '..' alias.

- cd ..; cd ../..; cd ../../..; cd ../../../.. are aliased by
  default on zsh to ..; ...; ....; ..... respectively.
---
 zsh/aliases.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index f4c67c4..567cf6b 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -15,7 +15,6 @@ alias psg="ps aux | grep "
 alias psr='ps aux | grep ruby'
 
 # Moving around
-alias ..='cd ..'
 alias cdb='cd -'
 
 # Show human friendly numbers and colors

From 89a49173aef63fd0b920a7b4b97dc8b40e098dcb Mon Sep 17 00:00:00 2001
From: Rafael Regis <rafael.regisp@gmail.com>
Date: Thu, 17 Jan 2013 14:44:23 -0200
Subject: [PATCH 2/3] Use vim instead of vi.

- vi command uses vim that comes with the system instead of the one of MacVim.
---
 zsh/aliases.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 567cf6b..83a53e8 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -27,7 +27,7 @@ alias du='du -h -d 2'
 alias lsg='ll | grep'
 
 # Alias Editing
-alias ae='vi $yadr/zsh/aliases.zsh' #alias edit
+alias ae='vim $yadr/zsh/aliases.zsh' #alias edit
 alias ar='source $yadr/zsh/aliases.zsh'  #alias reload
 
 # vim using
@@ -38,10 +38,10 @@ if [ $MACVIM_INSTALLED -eq 0 ]; then
 fi
 
 # vimrc editing
-alias ve='vi ~/.vimrc'
+alias ve='vim ~/.vimrc'
 
 # zsh profile editing
-alias ze='vi ~/.zshrc'
+alias ze='vim ~/.zshrc'
 alias zr='source ~/.zshrc'
 
 # Git Aliases
@@ -53,7 +53,7 @@ alias gsa='git stash apply'
 alias gsh='git show'
 alias gshw='git show'
 alias gshow='git show'
-alias gi='vi .gitignore'
+alias gi='vim .gitignore'
 alias gcm='git ci -m'
 alias gcim='git ci -m'
 alias gci='git ci'

From dab6d99f685020c47829140364e53c849de86255 Mon Sep 17 00:00:00 2001
From: Rafael Regis <rafael.regisp@gmail.com>
Date: Thu, 17 Jan 2013 22:56:38 -0200
Subject: [PATCH 3/3] Delete yuv alias, as asked by the comment.

---
 zsh/aliases.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 83a53e8..d8859a2 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -5,7 +5,6 @@ yadr=$HOME/.yadr
 
 # YADR support
 alias yav='yadr vim-add-plugin'
-alias yuv='yadr update-plugins' #FIXME: backwards compatibility. Kill me after Jan 1, 2013
 alias yup='yadr update-plugins'
 alias yip='yadr init-plugins'