Permalink
Browse files

Make commands look nice.

  • Loading branch information...
1 parent d69d2e8 commit ef369ab5cb7f18d2db7d6d0b0a4c97fc14e0b08d @dosire committed Mar 6, 2013
Showing with 12 additions and 2 deletions.
  1. +12 −2 README.md
View
@@ -119,9 +119,19 @@ $ sudo /etc/init.d/xvfb start
Updating
---------------
-When you run 'vagrant destroy' and 'vagrant up' the gitlabhq version is not updated. You must update it yourself by going to the gitlabhq subdirectory in the gitlab-vagrant-vm repo and running 'git pull --ff'.
+The gitlabhq version is _not_ updated when you rebuild your virtual machine with the following command:
-A bit of background on why this is needed follows. When you run 'vagrant up' there is a [checkout action in the recipe](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/recipes/vagrant.rb#L54) that [points to](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/attributes/vagrant.rb#L10) the [gitlabhq repo](https://github.com/gitlabhq/gitlabhq). You won't see any difference when running 'git status' in the gitlab-vagrant-vm repo because gitlabhq/ is in the [.gitignore](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/.gitignore). You can update the gitlabhq repo yourself or remove the gitlabhq directory so the repo is checked out again.
+```bash
+$ vagrant destroy && vagrant up
+```
+
+You must update it yourself by going to the gitlabhq subdirectory in the gitlab-vagrant-vm repo and pulling the latest changes:
+
+```bash
+$ cd gitlabhq && git pull --ff origin master
+```
+
+A bit of background on why this is needed. When you run 'vagrant up' there is a [checkout action in the recipe](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/recipes/vagrant.rb#L54) that [points to](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/site-cookbooks/gitlab/attributes/vagrant.rb#L10) the [gitlabhq repo](https://github.com/gitlabhq/gitlabhq). You won't see any difference when running 'git status' in the gitlab-vagrant-vm repo because gitlabhq/ is in the [.gitignore](https://github.com/gitlabhq/gitlab-vagrant-vm/blob/master/.gitignore). You can update the gitlabhq repo yourself or remove the gitlabhq directory so the repo is checked out again.
Troubleshooting

0 comments on commit ef369ab

Please sign in to comment.