summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <dblessing@users.noreply.github.com>2014-12-20 09:25:56 -0600
committerDrew Blessing <dblessing@users.noreply.github.com>2014-12-20 09:25:56 -0600
commit3f13a0466f9fbc1784db260c2e06c05121c10375 (patch)
tree1e7b9893596a030f9dd0be0e3c67e1afae7fb40c
parent13104450cfd82f4a92e59a734f78effb2a4a9e97 (diff)
parent1e22b494e2618e004ad816ed92b8aca70fa037e5 (diff)
downloadgitlab-ce-3f13a0466f9fbc1784db260c2e06c05121c10375.tar.gz
Merge pull request #8469 from xperseguers/patch-1
[BUGFIX] Invalid branch in comparison
-rw-r--r--doc/update/7.5-to-7.6.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/7.5-to-7.6.md b/doc/update/7.5-to-7.6.md
index 11058c211ca..35cd437fdc4 100644
--- a/doc/update/7.5-to-7.6.md
+++ b/doc/update/7.5-to-7.6.md
@@ -70,7 +70,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
```
-git diff origin/7-6-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
+git diff origin/7-5-stable:config/gitlab.yml.example origin/7-6-stable:config/gitlab.yml.example
```
#### Change Nginx settings