From cdeb4153c05eae198a091676b5a91f5bc2bc9b78 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@qosmos.com>
Date: Fri, 24 Jan 2014 12:21:22 +0100
Subject: [Git] aliases.

---
 user:hugues/Aliases.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh
index 435daa9..4a2322b 100644
--- a/user:hugues/Aliases.zsh
+++ b/user:hugues/Aliases.zsh
@@ -72,6 +72,9 @@ a lc='ls -c'
 a l1='\ls -1'
 
 a gitk='\gitk --date-order'
+a gm='\git mergetool'
+a grc='\git rebase --continue'
+a gra='\git rebase --abort'
 
 __cmd_exists dict && a definition='dict -h dict.org'
 __cmd_exists dict && a traduction='dict -h hiegel.fr -P-'
-- 
cgit v1.2.3