Permalink
Browse files

Merge branch 'master' of github.com:mattly/dotfiles

  • Loading branch information...
2 parents 7f825c4 + d7700d5 commit a37a350269b785096ec78bb531aa31d8fc2b3356 @mattly committed Apr 3, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −3 gitconfig
  2. +1 −1 tmux.conf
  3. 0 utils/colortest
  4. +1 −0 zsh/50_aliases.zsh
View
5 gitconfig
@@ -44,7 +44,6 @@
default=current
[alias]
- amen = !sh -c 'say can I get a hallelujah!'
# amend to the last commit
amend = commit --amend -C HEAD
# add only part of the commit to index
@@ -55,12 +54,12 @@
branches = branch -a --color -v
# remove all local branches included in the current branch
cleanup = !sh -c 'git branch --merged | grep -E "^[^*]" --exclude "^\\s*master" | xargs -n1 git branch -d'
+ # removes remote branches that have been merged into HEAD
+ cleanup-remotes = !"f() { git branch -r --merged | cut -d \\ -f 3 | while read branch; do test `git rev-parse $branch` == `git rev-parse HEAD` && echo \"skipping branch $branch\" || (echo \"deleting branch $branch\" && echo $branch | sed 's/\\//\\ :/' | xargs -t git push ); done }; f"
# shallow clone a repository, because we don't care about history
clone-shallow = clone --depth 1
# delete a remote branch
delete = !sh -c 'git push "$0" :refs/heads/"$1"'
- # inspired by my co-workers
- fix = commit -am "fix"
# merge the branch, keeping its commits in their own branch
fold = merge --no-ff
# put this branch at a particular ref
View
2 tmux.conf
@@ -38,7 +38,7 @@ set -g xterm-keys on
bind-key -r C-h select-window -t :-
bind-key -r C-l select-window -t :+
bind-key -r z last-window
- bind , command-prompt "rename=window '%%'"
+ bind , command-prompt "rename-window '%%'"
# Pane Management and Navigation
# ================================
View
0 utils/colortest 100644 → 100755
File mode changed.
View
1 zsh/50_aliases.zsh
@@ -25,4 +25,5 @@ alias tig='tig --all'
# ruby
alias blunder='bundler'
+alias lolruby="ps | grep ruby | awk '{print $1}' | xargs kill -9"

0 comments on commit a37a350

Please sign in to comment.