summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user:hugues/Aliases.zsh3
1 files changed, 3 insertions, 0 deletions
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-'