summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-08-02 12:35:39 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-08-02 12:35:39 +0200
commit4809cbaef0a8df5da6d65e476f32f358ba0278cd (patch)
treeb1ff49c9d50bffd9ff83ba788e8286d82e181e19 /doc
parentec18f0bae557c6368c4ac211041a81bfe05492e8 (diff)
parentd32ec4ce9973f1903e0136a66dbae5c8e2296c60 (diff)
downloadgitlab-ce-4809cbaef0a8df5da6d65e476f32f358ba0278cd.tar.gz
Merge pull request #7201 from nacengineer/patch-2
Update 6.9-to-7.0.md
Diffstat (limited to 'doc')
-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