Permalink
Browse files

added gdw alias

  • Loading branch information...
1 parent 15bc28d commit 4aeb0e92d4c4f869c5af336f4742237023726871 @aziz committed Aug 23, 2012
Showing with 11 additions and 2 deletions.
  1. +3 −1 TODO.md
  2. +7 −1 bash/aliases/custom.aliases.bash
  3. +1 −0 bash/aliases/git.aliases.bash
View
@@ -1,5 +1,7 @@
# TODO:
-- OSX for hackers https://gist.github.com/2260182
+- OSX for hackers:
+ - https://gist.github.com/2260182
+ - https://github.com/mathiasbynens/dotfiles/blob/master/.osx
- https://github.com/xiongchiamiov/terminal-screensaver
- compile npmrc on install just like gitconfig
- https://github.com/cowboy/dotfiles
@@ -42,4 +42,10 @@ function git_current_branch() {
alias burt_staging='git push -f origin $(git_current_branch):staging && cap staging deploy'
alias burt_prod='git push -f origin $(git_current_branch):production && cap production deploy'
-alias burt_accept='git push -f origin $(git_current_branch):accept && cap accept deploy'
+alias burt_accept='git push -f origin $(git_current_branch):accept && cap accept deploy'
+
+
+# Clean up
+alias rm='rmtrash'
+alias diff='colordiff'
+alias find='gfind'
@@ -18,6 +18,7 @@ alias gpo='git push origin'
alias gdv='git diff -w "$@" | vim -R -'
alias gd='git diff'
alias gdd='git diff --cached'
+alias gdw='git diff --color-words'
alias gdt='git difftool'
alias gc='git commit -v'
alias gca='git commit -v -a'

0 comments on commit 4aeb0e9

Please sign in to comment.