added git settings, including git aliases taken from https://github.com/garybernhardt/dotfiles/

2012-06-01 10:26:27 -07:00
parent 526ce49b7c
commit 8c69a53cbe
4 changed files with 86 additions and 1 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -0,0 +1,32 @@
+[diff]
+[color]
+    ui = auto
+[alias]
+    st = status
+    ci = commit
+    co = checkout
+    di = diff
+    dc = diff --cached
+    amend = commit --amend
+    aa = add --all
+    ff = merge --ff-only
+    pullff = pull --ff-only
+    noff = merge --no-ff
+    div = divergence
+    gn = goodness
+    gnc = goodness --cached
+    fa = fetch --all
+    pom = push origin master
+    b = branch
+    ds = diff --stat=160,120
+    dh1 = diff HEAD~1
+
+    head = !git l -1
+    h = !git head
+    hp = "!source ~/.githelpers && show_git_head"
+    r = !git l -30
+    ra = !git r --all
+    l = "!source ~/.githelpers && pretty_git_log"
+    la = !git l --all
+[merge]
+    tool = vimdiff