1 files changed, 3 insertions(+), 3 deletions(-)

M git/.gitconfig

@@ 16,12 16,12 @@
 	dc = diff --cached
 	amend = commit --amend
 	fa = fetch --all
-	ps = push origin
-	pl = pull origin
+	ps = push
+	pl = pull
 	dh1 = diff HEAD~1
 	hard = reset --hard FETCH_HEAD
 [pull]
-	rebase = false
+	rebase = true
 [gpg]
 	program = gpg2
 [init]