Aliases and vimrc update

This commit is contained in:
Michael Campagnaro 2013-08-30 13:11:59 -04:00
parent 238dc1a0a8
commit 53b040f40a
2 changed files with 5 additions and 3 deletions

4
vimrc
View File

@ -46,6 +46,7 @@ set laststatus=2
set showmatch set showmatch
set incsearch set incsearch
set dictionary+=/usr/share/dict/words set dictionary+=/usr/share/dict/words
set clipboard=unnamed " yank and paste with the system clipboard
set number set number
set hlsearch set hlsearch
" make searches case-sensitive only if they contain upper-case characters " make searches case-sensitive only if they contain upper-case characters
@ -78,7 +79,8 @@ syntax on
" Also load indent files, to automatically do language-dependent indenting. " Also load indent files, to automatically do language-dependent indenting.
filetype plugin indent on filetype plugin indent on
" use emacs-style tab completion when selecting files, etc " use emacs-style tab completion when selecting files, etc
set wildmode=longest,list set wildmenu
set wildmode=longest,list,full
colorscheme Monokai colorscheme Monokai
set wildignore+=*/tmp/*,*/log/*,*.so,*.swp,*.zip,*/rdoc/* set wildignore+=*/tmp/*,*/log/*,*.so,*.swp,*.zip,*/rdoc/*
set colorcolumn=90 set colorcolumn=90

View File

@ -63,8 +63,8 @@ alias zsh='vim ~/.zshrc'
# Git # Git
alias ammend='amend' alias ammend='amend'
alias amend='git commit --amend' alias amend='git commit --amend'
alias gaa='echo "Use ga!" && git add --all' alias gaa='echo "Use ga!" && git add -A :/'
alias ga='git add --all' alias ga='git add -A :/'
alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed
alias gau='git add --update' alias gau='git add --update'
alias gb='git branch' alias gb='git branch'