cleanup git related aliases

isemenko · Jul 26, 2013 · ca1a7d7 · ca1a7d7
1 parent 811f450
commit ca1a7d7
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 107 deletions.
diff --git a/bin/git-all b/bin/git-all
diff --git a/bin/git-amend b/bin/git-amend
diff --git a/bin/git-credit b/bin/git-credit
diff --git a/bin/git-undo b/bin/git-undo
diff --git a/bin/git-up b/bin/git-up
diff --git a/bin/gitio b/bin/gitio
diff --git a/bin/search b/bin/search
diff --git a/git/aliases.zsh b/git/aliases.zsh
@@ -7,14 +7,17 @@ then
 fi
 
 # The rest of my fun git aliases
-alias gl='git pull --prune'
-alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+alias gpp='git pull --prune'
+alias gl="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+alias gls= 'git log --pretty=format:"%C(reset)%h %C(yellow)%ad%C(yellow)%d %C(reset)%s%C(green) [%cn]" --decorate --date=short'
 alias gp='git push origin HEAD'
 alias gpr='git pull --rebase'
 alias gd='git diff'
 alias gc='git commit -m'
 alias gca='git commit -a'
+alias gcam='git commit -a -m'
 alias gco='git checkout'
 alias gb='git branch'
 alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
 alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
+alias greset='git reset --soft HEAD^'
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
@@ -2,7 +2,11 @@ alias reload!='. ~/.zshrc'
 
 alias myip="curl -s icanhazip.com"
 
+#cat with syntax highlighting
 alias c='~/tools/pygments/pygmentize -O style=monokai -f console256 -g'
+# Quick search in a directory for a string. use -iru to search directories ack usually ignores (like .git)
+alias s='ack -i'
+
 
 alias hosts='sudo $EDITOR /etc/hosts'
 #list only directories