Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/174805
Change subject: Fixed some bad advice in doc messages. ...................................................................... Fixed some bad advice in doc messages. No vagrant users should really ever be using 'git pull.' If a dev has any local changes committed, this will make a real mess. https://wikitech.wikimedia.org/wiki/Help:Git_rebase Change-Id: I7f0fd8e952e5c13ac038e96373d21a38b133e189 --- M README.md M puppet/modules/misc/files/etc_profile.d/mediawiki-vagrant.sh 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/05/174805/1 diff --git a/README.md b/README.md index 52661e3..041d7be 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,8 @@ MediaWiki. To pick up other changes to the install, on the host computer in the directory -with the vagrant files run `git pull` and then `vagrant reload`. The latter -will restart the VM. +with the vagrant files run `git pull --rebase` and then `vagrant reload`. +The latter will restart the VM. ## Extend diff --git a/puppet/modules/misc/files/etc_profile.d/mediawiki-vagrant.sh b/puppet/modules/misc/files/etc_profile.d/mediawiki-vagrant.sh index 91100df..0a7d05d 100755 --- a/puppet/modules/misc/files/etc_profile.d/mediawiki-vagrant.sh +++ b/puppet/modules/misc/files/etc_profile.d/mediawiki-vagrant.sh @@ -21,7 +21,7 @@ commits=$(git --git-dir=/vagrant/.git rev-list HEAD...origin/master --right-only --count 2>/dev/null) if [ -n "$commits" ] && [ "$commits" -gt 0 ]; then printf "Updates for MediaWiki-Vagrant are available. " - printf "Run '$(tput bold; tput setaf 3)git pull$(tput sgr0)' in your Vagrant directory to get them.\n" + printf "Run '$(tput bold; tput setaf 3)git pull --rebase$(tput sgr0)' in your Vagrant directory to get them.\n" fi # enable bash completion -- To view, visit https://gerrit.wikimedia.org/r/174805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f0fd8e952e5c13ac038e96373d21a38b133e189 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
