Merge pull request #5619 from taziyah/patch-1

Fix diff command for gitlab.yml.example

Merge pull request #5619 from taziyah/patch-1
Fix diff command for gitlab.yml.example
Jacob Vosmaer
2 parents 33eae334 8ddadc99
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
doc/update/6.0-to-6.2.md
@@ -74,7 +74,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
 TIP: to see what changed in gitlab.yml.example in this release use next command: 
 ```
-git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example
 ```
 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.
	@@ -74,7 +74,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production		@@ -74,7 +74,7 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
74	TIP: to see what changed in gitlab.yml.example in this release use next command:	74	TIP: to see what changed in gitlab.yml.example in this release use next command:
75		75
76	```	76	```
77	-git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example	77	+git diff 6-0-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example
78	```	78	```
79		79
80	* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.	80	* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.