From 5d7b010b61ea4d64210c7cbd913f7465f9eb4b55 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Tue, 18 Jun 2019 11:35:42 +0100 Subject: [PATCH] Add aliases for merging and rebasing (m and r) --- states/git/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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', } %} -- 2.45.2