diff --git a/git/git.zsh b/git/git.zsh index 0283b6f..5248b8a 100644 --- a/git/git.zsh +++ b/git/git.zsh @@ -1,5 +1,4 @@ # git aliases -alias g='git' alias ga='git add' alias gb='git branch' alias gl='git pull' @@ -33,3 +32,13 @@ function git-rename() { git mv $1 "${2}-" git mv "${2}-" $2 } + +function g() { + if [[ $# > 0 ]]; then + # if there are arguments, send them to git + git $@ + else + # otherwise, run git status + git s + fi +} diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink index 4fffc85..5abd779 100644 --- a/vim/vimrc.symlink +++ b/vim/vimrc.symlink @@ -11,7 +11,6 @@ Bundle 'gmarik/vundle' Bundle 'kien/ctrlp.vim' Bundle 'scrooloose/nerdtree' Bundle 'mileszs/ack.vim' -" Bundle 'scrooloose/syntastic' Bundle 'Raimondi/delimitMate' Bundle 'tpope/vim-commentary' Bundle 'tpope/vim-endwise' @@ -24,7 +23,6 @@ Bundle 'mmalecki/vim-node.js' Bundle 'Lokaltog/vim-powerline' Bundle 'tpope/vim-ragtag' Bundle 'tpope/vim-surround' -" Bundle 'sjl/vitality.vim' Bundle 'duff/vim-scratch' Bundle 'cakebaker/scss-syntax.vim' Bundle 'kchmck/vim-coffee-script' @@ -34,8 +32,8 @@ Bundle 'tsaleh/vim-matchit' Bundle 'benmills/vimux' Bundle 'mattn/zencoding-vim' Bundle 'int3/vim-taglist-plus' -Bundle 'airblade/vim-gitgutter' Bundle 'ap/vim-css-color' +Bundle 'nicknisi/ir-whack' filetype plugin indent on @@ -153,7 +151,7 @@ set tm=500 syntax on set background=dark -colorscheme smyck +colorscheme ir-whack " set number " show line numbers set relativenumber " show relative line numbers diff --git a/zsh/functions.zsh b/zsh/functions.zsh index 509e321..0266d6a 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -19,6 +19,9 @@ function md() { mkdir -p "$@" && cd "$@" } +function hist() { + history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head +} # find shorthand function f() {