Skip to content

Commit 895f233

Browse files
committed
Add --rebase option to git pull commands
1 parent ee9d81f commit 895f233

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

InstallControllerBuddy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ function install_dcs_integration() {
444444
rm -rf "$cb_dcs_integration_dir"
445445
else
446446
log 'Pulling ControllerBuddy-DCS-Integration repository...'
447-
git -C "$cb_dcs_integration_dir" pull origin master
447+
git -C "$cb_dcs_integration_dir" pull origin master --rebase
448448
check_retval 'Error: Failed to pull ControllerBuddy-DCS-Integration repository'
449449
fi
450450
elif [ "$uninstall" != true ]
@@ -735,7 +735,7 @@ else
735735
log 'Pulling ControllerBuddy-Profiles repository...'
736736
git -C "$cb_profiles_dir" fetch origin &&
737737
git -C "$cb_profiles_dir" checkout "$cb_profiles_branch" &&
738-
git -C "$cb_profiles_dir" pull origin "$cb_profiles_branch"
738+
git -C "$cb_profiles_dir" pull origin "$cb_profiles_branch" --rebase
739739
check_retval 'Error: Failed to pull ControllerBuddy-Profiles repository'
740740
else
741741
log 'Cloning ControllerBuddy-Profiles repository...'

0 commit comments

Comments
 (0)