@@ -7,6 +7,8 @@
ui = true
[push]
default = simple
+[pull]
+ rebase = true
[alias]
a = add
s = status -suall
@@ -15,3 +17,4 @@
sa = stash apply
l = !git log --graph --pretty=format:'%C(yellow)%h%Creset -%C(bold red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
pp = !git pull && git push
+
