michael/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Alias update

Browse Source
This commit is contained in:
Michael Campagnaro 2013-07-25 12:54:40 -04:00
parent ee6c2ed3a6
commit d9c8451aeb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zsh/aliases
View File

@ -84,6 +84,7 @@ alias gh="source ~/.githelpers && show_git_head"
alias gl='gll -25' alias gl='gll -25'
alias gll="source ~/.githelpers && pretty_git_log" alias gll="source ~/.githelpers && pretty_git_log"
alias gla='gll --all' alias gla='gll --all'
alias gm='git merge'
alias gmff='git merge --ff-only' alias gmff='git merge --ff-only'
alias gmtheirs='git merge -Xtheirs' alias gmtheirs='git merge -Xtheirs'
alias gp='git push' alias gp='git push'

2
zshrc
View File

@ -27,7 +27,7 @@ export TERM=xterm-256color
export EDITOR=vi export EDITOR=vi
# Grep tweaks # Grep tweaks
export GREP_OPTIONS="-nRi --color --exclude-dir=tmp" # --exclude-dir=public --exclude-dir=log --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc" export GREP_OPTIONS="-nRi --color --exclude-dir=tmp --exclude-dir=public --exclude-dir=log" # --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
# Save a ton of history # Save a ton of history
export HISTSIZE=20000 export HISTSIZE=20000