udpate lib

gdbtek · May 24, 2021 · 37805cb · 37805cb
1 parent f3012a7
commit 37805cb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libraries/util.bash b/libraries/util.bash
@@ -2473,9 +2473,10 @@ function configUserGIT()
     checkNonEmptyString "${gitUserName}" 'undefined git user name'
     checkNonEmptyString "${gitUserEmail}" 'undefined git user email'
 
-    su -l "${userLogin}" -c "git config --global user.name '${gitUserName}'"
-    su -l "${userLogin}" -c "git config --global user.email '${gitUserEmail}'"
+    su -l "${userLogin}" -c 'git config --global pull.rebase false'
     su -l "${userLogin}" -c 'git config --global push.default simple'
+    su -l "${userLogin}" -c "git config --global user.email '${gitUserEmail}'"
+    su -l "${userLogin}" -c "git config --global user.name '${gitUserName}'"
 
     info "$(su -l "${userLogin}" -c 'git config --list')"
 }