X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=9d03b7d686b03545c04ed876a1765219c58d836d;hb=d28495f157ce749d456fc494e9f70b0544ac3eec;hp=2b16d5806f328decbcba10add84ee234d1bd2649;hpb=970d2c33a521dc6e6e50dc6d3565c853faad9ae2;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 2b16d58..9d03b7d 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,13 +15,13 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'true',
+  'pull.rebase': 'false',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.struct': 'log --graph --full-history --all --pretty=format:\'%ad %s %Creset %C(yellow)%d%Creset\' --date=short --simplify-by-decoration',
   'alias.co': 'checkout',
-  'alias.ci': 'commit -S',
-  'alias.commit': 'commit -S',
+  'alias.ci': 'commit',
   'alias.st': 'status',
   'alias.vh': 'verify-commit HEAD',
   'alias.vc': 'verify-commit',
@@ -29,9 +29,9 @@ 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.r': 'rebase -S',
-  'alias.m': 'merge -S',
-  'alias.pa': '!git remote | xargs L1 git push --all',
+  'alias.r': 'rebase',
+  'alias.m': 'merge',
+  'alias.pa': '!git remote | xargs -L1 git push --all',
 }
 %}