From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 18 Jun 2019 10:35:42 +0000 (+0100)
Subject: Add aliases for merging and rebasing (m and r)
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=5d7b010b61ea4d64210c7cbd913f7465f9eb4b55;p=max%2Fsaltfiles.git

Add aliases for merging and rebasing (m and r)
---

diff --git a/states/git/init.sls b/states/git/init.sls
index 7ef7a31..861d6ed 100644
--- 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',
 }
 %}