Add aliases for merging and rebasing (m and r)

diff --git a/states/git/init.sls b/states/git/init.sls
index 7ef7a31ac2aef6e4489441930e68fc3ce407b2a3..861d6ed395f09c6b8fb72295fe9ec7489de3abc4 100644 (file)
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -29,8 +29,8 @@ include:
   'alias.tag': 'tag -s',
   'alias.t': 'tag -s',
   'alias.alias': '!req=$\'\\033[0;31m=\\033[0m\'; git config --get-regexp ^alias\. | sed -e s/^alias\.// -e "s/\ /\t$req\ /"',
-  'alias.rebase': 'rebase -S',
-  'alias.merge': 'merge -S',
+  'alias.r': 'rebase -S',
+  'alias.m': 'merge -S',
 }
 %}