Permalink
Browse files

Move git aliases into gotconfig

  • Loading branch information...
1 parent 19edbcf commit 47c9f972896c075f29eb2cdb92906e2f53a07741 @thejspr committed Apr 17, 2012
Showing with 25 additions and 33 deletions.
  1. +4 −17 aliases
  2. +2 −2 gitconfig
  3. +18 −13 vimrc
  4. +1 −1 zshrc
View
21 aliases
@@ -34,20 +34,14 @@ alias -g N='&>/dev/null&'
alias -g W='|wc'
#git
-unalias g
-alias git=hub
g() {
if [[ $# == '0' ]]; then
- command hub status -sb
+ command git status -sb
else
- command hub "$@";
+ command git "$@";
fi
}
-
-alias gl='git log --oneline --decorate -20'
-alias gd='git diff'
-alias gdw='git diff --word-diff'
-alias gci='git commit -v --no-verify'
+complete -o default -o nospace -F _git g
grmb() { git push origin :"$@"; git branch -D "$@" }
#rails
@@ -72,6 +66,7 @@ alias rt='rake -T'
#heroku
alias h="heroku"
+complete -o default -o nospace -F _heroke h
hpush() { git add -A; git commit -m "$*"; git push heroku master; }
#servers
@@ -81,18 +76,10 @@ myip() { elinks -dump http://checkip.dyndns.org:8245/ }
#msc
alias mx='chmod +x'
alias cd..='cd ..'
-alias ll='ls -lA'
alias grep='grep --color=auto'
# system and files editing
alias ea='vim ~/.aliases'
alias ez='vim ~/Code/dotfiles/zshrc'
alias ez_='vim ~/Code/dotfiles/_zshrc'
alias sr='source ~/.zshrc'
-
-# aptitude conviniences
-alias ain='sudo apt-get install $@ -y'
-alias aun='sudo apt-get remove'
-alias afi='sudo apt-cache search'
-alias aup='sudo apt-get update && sudo apt-get upgrade -y'
-alias aclean='sudo apt-get autoclean && sudo apt-get autoremove && sudo apt-get clean && sudo apt-get remove'
View
@@ -4,7 +4,7 @@
[github]
user = thejspr
[color]
- ui = true
+ ui = auto
[mergetool]
keepBackup = false
[push]
@@ -19,7 +19,7 @@
ms = checkout master
co = checkout
b = branch
- l = log
+ l = !git log --oneline --decorate --graph -20
r = remote
rc = !git add -A && git rebase --continue
alias = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\\t => \\2/' | sort
View
31 vimrc
@@ -10,13 +10,13 @@ Bundle 'gmarik/vundle'
Bundle 'bitc/vim-bad-whitespace'
" Bundle 'clones/vim-fuzzyfinder'
Bundle 'ervandew/supertab'
-Bundle 'git://git.wincent.com/command-t'
+" Bundle 'git://git.wincent.com/command-t'
Bundle 'godlygeek/tabular'
Bundle 'mileszs/ack.vim'
Bundle 'msanders/snipmate.vim'
Bundle 'kana/vim-textobj-user'
Bundle 'nelstrom/vim-textobj-rubyblock'
-" Bundle 'panozzaj/vim-autocorrect'
+Bundle 'panozzaj/vim-autocorrect'
Bundle 'scrooloose/nerdtree'
Bundle 'sickill/vim-pasta'
Bundle 'tomtom/tcomment_vim'
@@ -26,9 +26,12 @@ Bundle 'vim-coffee-script'
Bundle 'tpope/vim-endwise'
Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-rails'
-" Bundle 'tpope/vim-repeat'
+Bundle 'tpope/vim-repeat'
Bundle 'tpope/vim-surround'
Bundle 'Auto-Pairs'
+Bundle 'sjl/vitality.vim'
+Bundle 'kien/ctrlp.vim'
+Bundle 'sjl/clam.vim'
filetype plugin indent on " and turn it back on!
@@ -41,6 +44,7 @@ runtime macros/matchit.vim
filetype plugin indent on
let mapleader = ","
let g:mapleader = ","
+let maplocalleader = ";"
set modelines=0
set history=1000
set nobackup
@@ -262,16 +266,17 @@ let g:NERDTreeWinSize = 30
let g:NERDTreeIgnore=['\.git$','\.sass-cache', '\.DS_Store']
" Command-t
-map <leader>t :CommandTFlush<cr>\|:CommandT<cr>
-map <leader>gv :CommandTFlush<cr>\|:CommandT app/views<cr>
-map <leader>gc :CommandTFlush<cr>\|:CommandT app/controllers<cr>
-map <leader>gm :CommandTFlush<cr>\|:CommandT app/models<cr>
-map <leader>gh :CommandTFlush<cr>\|:CommandT app/helpers<cr>
-map <leader>gl :CommandTFlush<cr>\|:CommandT lib<cr>
-map <leader>gp :CommandTFlush<cr>\|:CommandT public<cr>
-map <leader>gs :CommandTFlush<cr>\|:CommandT public/stylesheets<cr>
-let g:CommandTMatchWindowAtTop=0 " show window at top
-let g:CommandTMaxHeight=20
+" map <leader>t :CommandTFlush<cr>\|:CommandT<cr>
+" map <leader>gv :CommandTFlush<cr>\|:CommandT app/views<cr>
+" map <leader>gc :CommandTFlush<cr>\|:CommandT app/controllers<cr>
+" map <leader>gm :CommandTFlush<cr>\|:CommandT app/models<cr>
+" map <leader>gh :CommandTFlush<cr>\|:CommandT app/helpers<cr>
+" map <leader>gl :CommandTFlush<cr>\|:CommandT lib<cr>
+" map <leader>gp :CommandTFlush<cr>\|:CommandT public<cr>
+" map <leader>gs :CommandTFlush<cr>\|:CommandT public/stylesheets<cr>
+" let g:CommandTMatchWindowAtTop=0 " show window at top
+" let g:CommandTMaxHeight=20
+map <leader>t :CtrlP<cr>
set wildignore+=*.o,*~,*.obj,.git/**,tmp/**,app/assets/images/**,public/**
set wildignore+=*.class,*.doc,*.lock,**.png,**.jpg,**.jpeg
set wildignore+=*.sass-cache/**,build/**,coverage/**,_deploy/**,solr/**
View
2 zshrc
@@ -1,4 +1,4 @@
-export PATH=$HOME/.rbenv/bin:/usr/local/bin:~/bin:$PATH
+export PATH=$HOME/.rbenv/bin:/usr/local/bin:~/bin:/usr/local/share/python:$PATH
# Path to your oh-my-zsh configuration.
export ZSH=$HOME/.oh-my-zsh

0 comments on commit 47c9f97

Please sign in to comment.