Commit 518c7822 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-24' into 'master'

Recommend a `-p` while `git fetch`ing

See merge request gitlab-org/gitlab-ce!18016
parents 22501582 8426c04e
...@@ -103,7 +103,7 @@ rm go1.8.3.linux-amd64.tar.gz ...@@ -103,7 +103,7 @@ rm go1.8.3.linux-amd64.tar.gz
```bash ```bash
cd /home/git/gitlab cd /home/git/gitlab
sudo -u git -H git fetch --all sudo -u git -H git fetch --all --prune
sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
sudo -u git -H git checkout -- locale sudo -u git -H git checkout -- locale
``` ```
...@@ -131,7 +131,7 @@ sudo -u git -H git checkout 10-6-stable-ee ...@@ -131,7 +131,7 @@ sudo -u git -H git checkout 10-6-stable-ee
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags sudo -u git -H git fetch --all --tags --prune
sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION) sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION)
sudo -u git -H bin/compile sudo -u git -H bin/compile
``` ```
...@@ -146,7 +146,7 @@ If you are not using Linux you may have to run `gmake` instead of ...@@ -146,7 +146,7 @@ If you are not using Linux you may have to run `gmake` instead of
```bash ```bash
cd /home/git/gitlab-workhorse cd /home/git/gitlab-workhorse
sudo -u git -H git fetch --all --tags sudo -u git -H git fetch --all --tags --prune
sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_WORKHORSE_VERSION) sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_WORKHORSE_VERSION)
sudo -u git -H make sudo -u git -H make
``` ```
...@@ -182,7 +182,7 @@ sudo -u git -H sed -i.pre-10.1 's/\[\[storages\]\]/[[storage]]/' /home/git/gital ...@@ -182,7 +182,7 @@ sudo -u git -H sed -i.pre-10.1 's/\[\[storages\]\]/[[storage]]/' /home/git/gital
```shell ```shell
cd /home/git/gitaly cd /home/git/gitaly
sudo -u git -H git fetch --all --tags sudo -u git -H git fetch --all --tags --prune
sudo -u git -H git checkout v$(</home/git/gitlab/GITALY_SERVER_VERSION) sudo -u git -H git checkout v$(</home/git/gitlab/GITALY_SERVER_VERSION)
sudo -u git -H make sudo -u git -H make
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment