178e3badd088

--- a/.gitconfig	Tue Sep 27 17:30:42 2011 -0400
+++ b/.gitconfig	Tue Sep 27 17:31:36 2011 -0400
@@ -1,48 +1,52 @@
 [user]
-name = Steve Losh
-email = steve@stevelosh.com
+    name = Steve Losh
+    email = steve@stevelosh.com
 
 [core]
-pager = cat
-editor = vim
-	excludesfile = /Users/sjl/.gitignore
+    pager = cat
+    editor = vim
+    excludesfile = /Users/sjl/.gitignore
 
 [alias]
-gl  = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
-gll = log     --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
+    gl  = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
+    gll = log     --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
 
-pull = pull --ff-only
-merge = merge --no-ff
+    pull = pull --ff-only
+    merge = merge --no-ff
+
+    ci = commit
+    cm = commit -m
 
-ci = commit
-cm = commit -m
+    co = checkout
 
-co = checkout
+    stat = status
+    st = status
 
-stat = status
-st = status
+    unstage = reset HEAD
+    uns = reset HEAD
 
-unstage = reset HEAD
-uns = reset HEAD
+    fo = fetch origin
+    moo = merge origin/ongoing
+    poo = push origin ongoing
 
 [color]
-branch = auto
-diff = auto
-interactive = auto
-status = auto
+    branch = auto
+    diff = auto
+    interactive = auto
+    status = auto
 
 [difftool "Kaleidoscope"]
-cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+    cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
 
 [difftool]
-prompt = false
+    prompt = false
 
 [diff]
-tool = Kaleidoscope
+    tool = Kaleidoscope
 
 [merge]
-tool = threesome
+    tool = threesome
 
 [mergetool "threesome"]
-cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
-trustExitCode = true
+    cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+    trustExitCode = true