Add git pull.rebase config

karlhorky · Aug 3, 2020 · 06949c7 · 06949c7
1 parent 66b6b1f
commit 06949c7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/fresh_install/brew_install.sh b/fresh_install/brew_install.sh
@@ -32,6 +32,9 @@ main() {
       || execute "brew install $formula" "brew install $formula"
   done
 
+  # Set Git reconciliation to merge (the default strategy)
+  git config --global pull.rebase false
+
   # Install diff-highlight module and set it as default pager
   make -C $(brew --prefix git)/share/git-core/contrib/diff-highlight
   ln -sf "$(brew --prefix git)/share/git-core/contrib/diff-highlight/diff-highlight" /usr/local/bin/diff-highlight