@@ -12,3 +12,13 @@
 
 [core]
     editor = vim
+
+[alias]
+    diverges = !bash -c 'diff -u <(git rev-list --first-parent "${1}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
+    st = status
+    ci = commit
+    br = branch
+    co = checkout
+    df = diff
+    lg = log -p
+
@@ -15,7 +15,8 @@
     print("You need readline, rlcompleter, and atexit")
 
 readline.parse_and_bind("tab: complete")
-readline.parse_and_bind ("bind ^I rl_complete")
+# this is needed for OSX, doesn't work in Linux
+#readline.parse_and_bind ("bind ^I rl_complete")
 
 class Completer(object):
     def __init__(self):
 
@@ -225,6 +225,11 @@ set incsearch               " Incrementally search while typing a /regex
 """" Display
 if has("gui_running")
     colorscheme solarized
+    " Remove menu bar
+    set guioptions-=m
+
+    " Remove toolbar
+    set guioptions-=T
 else
     colorscheme torte
 endif