gitconfig in zsh_dots-0.6.2

- old
+ new

@@ -9,12 +9,12 @@
 	ci = commit
 	st = status
 	on = branch
 	br = branch
   co = checkout
-  l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
-  lol = log --pretty=oneline --abbrev-commit --graph --decorate
+  blog = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset' --decorate
+  l = !git blog
   unstage = reset HEAD
   staged = diff --cached
   unstaged = diff
   current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
   track = checkout -t
@@ -27,9 +27,10 @@
   pull-upstream = !git pull --rebase origin master && git checkout master
   to-master = !export GIT_BRANCH=`git current-branch` && git pull-upstream  && git merge $GIT_BRANCH && git push origin master && git branch -D $GIT_BRANCH
   ship = !git to-master
   rename-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -m $GIT_BRANCH $1
   delete-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -D $GIT_BRANCH
+  prepare = rebase --interactive origin/master
 [apply]
   whitespace = warn
 [color]
   diff = auto
   status = auto