From 6a314423171391d5c5eb138df2b84656eee83d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9munaire?= <nemunaire@pomail.fr>
Date: Sat, 28 Dec 2013 16:37:18 +0100
Subject: [PATCH] New git aliases

---
 .bash_aliases | 1 -
 .gitconfig    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.bash_aliases b/.bash_aliases
index 4d6fe17..dd91e22 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -19,5 +19,4 @@ alias c='var=$(cal -m); echo "${var/$(date +%-d)/$(echo -e "\033[1;31m$(date +%-
 alias clean="rm *~ *.toc *.out *.aux \\#*\\#"
 alias mirror="wget --mirror --no-parent"
 alias ssh-add='ssh-add -t 10000'
-alias transmission-remote-cli='~/.transmission-remote-cli'
 alias rdesktop='rdesktop -k us-intl'
diff --git a/.gitconfig b/.gitconfig
index 651756c..29c7f55 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -15,7 +15,13 @@
 	st = status
 	br = branch
 	graph = log --graph --oneline --branches --all
+	st=status -sb
+	unstage=reset HEAD
+	uncommit=reset --soft HEAD^
+	wdiff=diff --word-diff
 [core]
 	editor = emacs -nw
 	excludesfile = ~/.gitignore
 	autocrlf = input
+[push]
+	default = simple