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

Add more git aliases

Browse Source
This commit is contained in:
Michael Campagnaro 2012-11-12 14:55:25 -05:00
parent 49bff18618
commit 043ec0e07b
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.gitconfig
View File

@ -1,35 +1,37 @@
[user] [user]
name = Michael Campagnaro name = Michael Campagnaro
email = mikecampo@gmail.com email = mikecampo@gmail.com
[diff] [diff]
[color] [color]
ui = auto ui = auto
[alias] [alias]
st = status p = push
ci = commit st = status
co = checkout ci = commit
di = diff co = checkout
dc = diff --cached di = diff
amend = commit --amend dc = diff --cached
aa = add --all amend = commit --amend
head = !git l -1 aa = add --all
h = !git head head = !git l -1
hp = "!source ~/.githelpers && show_git_head" h = !git head
r = !git l -20 hp = "!source ~/.githelpers && show_git_head"
ra = !git r --all r = !git l -20
ff = merge --ff-only re = remote
pullff = pull --ff-only ra = !git r --all
noff = merge --no-ff ff = merge --ff-only
l = "!source ~/.githelpers && pretty_git_log" pullff = pull --ff-only
la = !git l --all noff = merge --no-ff
div = divergence l = "!source ~/.githelpers && pretty_git_log"
gn = goodness la = !git l --all
gnc = goodness --cached div = divergence
fa = fetch --all gn = goodness
pom = push origin master gnc = goodness --cached
b = branch fa = fetch --all
ds = diff --stat=160,120 pom = push origin master
dh1 = diff HEAD~1 b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
[merge] [merge]
tool = vimdiff tool = vimdiff

6
.zshrc
View File

@ -31,7 +31,7 @@ alias ls='ls -G'
alias ll='ls -lG' alias ll='ls -lG'
alias l='ls -laG' alias l='ls -laG'
alias duh='du -csh' alias duh='du -csh'
export GREP_OPTIONS="--color" export GREP_OPTIONS="-n --color"
# Unbreak history # Unbreak history
export HISTSIZE=10000 export HISTSIZE=10000
@ -43,12 +43,14 @@ alias r=rails
alias g=git alias g=git
alias gst='git st' alias gst='git st'
alias gci='git ci' alias gci='git ci'
alias gp='git push'
alias gpom='git push origin master' alias gpom='git push origin master'
alias gf='git fetch' alias gf='git fetch'
alias gaa='git add --all' alias gaa='git add --all'
alias gl='!source ~/.githelpers && pretty_git_log' alias gl="!source ~/.githelpers && pretty_git_log"
alias gdc='git diff --cached' alias gdc='git diff --cached'
alias gam='git commit --amend' alias gam='git commit --amend'
alias gre='git remote'
alias cls=clear alias cls=clear
alias sl=ls # often screw this up alias sl=ls # often screw this up
alias history='fc -l 1' alias history='fc -l 1'