summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Southard <nacengineer@gmail.com>2014-06-25 15:52:45 -0500
committerDavid Southard <nacengineer@gmail.com>2014-06-25 15:52:45 -0500
commitd32ec4ce9973f1903e0136a66dbae5c8e2296c60 (patch)
tree11d4a5b0a0601f7954c3f13690b8b6bc711b01f6
parentfb3104dabf5a6e47019a795bef70c6dbf1aea3b2 (diff)
downloadgitlab-ce-d32ec4ce9973f1903e0136a66dbae5c8e2296c60.tar.gz
Update 6.9-to-7.0.md
fix gitlab.yml example diff command
-rw-r--r--doc/update/6.9-to-7.0.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/6.9-to-7.0.md b/doc/update/6.9-to-7.0.md
index 70a30a58687..6a3dd59934b 100644
--- a/doc/update/6.9-to-7.0.md
+++ b/doc/update/6.9-to-7.0.md
@@ -103,7 +103,7 @@ sudo chmod +x /etc/init.d/gitlab
There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml if desired.
```
-git diff 6-9-stable:config/gitlab.yml.example 7-0-stable:config/gitlab.yml.example
+git diff origin/6-9-stable:config/gitlab.yml.example origin/7-0-stable:config/gitlab.yml.example
```
### 7. Start application