From 1bf7c719f81994a7cc2c42acb20591f6fedb9300 Mon Sep 17 00:00:00 2001
From: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
Date: Fri, 19 Jul 2013 15:04:48 +0200
Subject: [PATCH] [git] Alias undo-commit

---
 git/gitconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index b085caa..7713643 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -32,11 +32,12 @@
   ls = ls-files
   gr = log --graph --oneline --decorate
   # From http://progit.org/book/ch2-11.html
-  unstage = reset HEAD --
-  last = log -1 HEAD
-  amend = commit --amend
+  unstage     = reset HEAD --
+  last        = log -1 HEAD
+  amend       = commit --amend
+  undo-commit = reset --soft HEAD^
   # From http://j.shirley.im/tech/git-flow/
-  feature-start = !git flow feature start $1
+  feature-start  = !git flow feature start $1
   feature-finish = !git flow feature finish $1 && git push
   # fs, feature start
   fs = !git flow feature start $1 && grb publish feature/$1