From eff8820e29d1df917afb233d91b583eb3c056e5b Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadusk@yahoo.com.br>
Date: Sun, 23 Mar 2014 19:28:27 -0300
Subject: [PATCH] Unified aliases in oh-my-zsh aliases file.

---
 lib/aliases.zsh           | 13 +++++++++----
 templates/zshrc-linux.zsh | 11 -----------
 templates/zshrc-mac.zsh   | 11 -----------
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index b0de2173b..518babfbc 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -26,6 +26,7 @@ else
     alias history='fc -l 1'
 fi
 
+alias afind='ack-grep -il'
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
@@ -33,9 +34,13 @@ alias ll='ls -l'
 alias la='ls -lA'
 alias l=la
 alias sl=ls # often screw this up
-
-alias afind='ack-grep -il'
-
 # Git aliases
+alias gita='git add -A'
 alias gits='git st'
-alias gitk='gitk --all &'
+alias gitl='git l'
+alias gitw='git who'
+alias gitt='git tags'
+# Aliases
+alias ta='tmux attach -t'
+alias tl='tmux list-session'
+alias ts='tmux new-session'
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index dd1afe86e..e625e5ded 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -45,16 +45,5 @@ if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
 
 [ "$TERM" = "xterm" ] && TERM="xterm-256color"
 
-# Aliases
-alias ta='tmux attach -t'
-alias tl='tmux list-session'
-alias ts='tmux new-session'
-# Git aliases
-alias gita='git add -A'
-alias gits='git status'
-alias gitl='git l'
-alias gitw='git who'
-alias gitt='git tags'
-
 source $ZSH/oh-my-zsh.sh
 unsetopt correctall
diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh
index 1bda5e370..97282c898 100644
--- a/templates/zshrc-mac.zsh
+++ b/templates/zshrc-mac.zsh
@@ -44,17 +44,6 @@ export EDITOR='vim'
 if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
 if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
-# Aliases
-alias ta='tmux attach -t'
-alias tl='tmux list-session'
-alias ts='tmux new-session'
-# Git aliases
-alias gita='git add -A'
-alias gits='git status'
-alias gitl='git l'
-alias gitw='git who'
-alias gitt='git tags'
-
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"