Update .gitconfig

diff --git a/.gitconfig b/.gitconfig
index e38baa0e704ab3c020dd017f1a57e768c5f791a4..f67c028bbffd0934771df85d0be828211b228bc6 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -168,6 +168,8 @@
        rbia = !exec git rbi123 --autosquash ''
        rbiap = !exec git rbi123 --autosquash --preserve-merges
        rbip = !exec git rbi123 '' --preserve-merges
+       rbiar = !exec git rbi123 --autosquash --rebase-merges
+       rbir = !exec git rbi123 '' --rebase-merges
        remotes = remote --verbose
        #root = !exec pwd
        root = rev-parse --show-toplevel
@@ -187,7 +189,7 @@
        clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
 
 [branch]
-       autosetuprebase = always
+       autoSetupRebase = remote
 
 [color]
        ui = auto
@@ -216,6 +218,9 @@
 # 3 way diffs
 #      cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[pull]
+       rebase = true
+
 [push]
        default = simple
        followTags = true