diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
| commit | 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa (patch) | |
| tree | dbf754ad57c523759284cf5d8af84fd9f096701a /doc/workflow | |
| parent | 2f706fbd231cabe7a76a5d17ac44285aaaf8592c (diff) | |
| parent | 3a63c00505307a1d1e8196c0eae72a79b2a6885f (diff) | |
| download | gitlab-ce-5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa.tar.gz | |
Merge branch 'revert-satellites' into 'master'
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/README.md | 1 | ||||
| -rw-r--r-- | doc/workflow/merge_requests.md | 40 |
2 files changed, 0 insertions, 41 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 5b8d72dfd34..3915198ad2a 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -13,5 +13,4 @@ - [Project users](add-user/add-user.md) - [Protected branches](protected_branches.md) - [Web Editor](web_editor.md) -- [Merge Requests](merge_requests.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md) diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md deleted file mode 100644 index 751e19da7f1..00000000000 --- a/doc/workflow/merge_requests.md +++ /dev/null @@ -1,40 +0,0 @@ -# Merge Requests - -Merge requests allow you to exchange changes you made to source code - -## Checkout merge requests locally - -Locate the section for your GitLab remote in the `.git/config` file. It looks like this: - -``` -[remote "origin"] - url = https://gitlab.com/gitlab-org/gitlab-ce.git - fetch = +refs/heads/*:refs/remotes/origin/* -``` - -Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section. - -It should looks like this: - -``` -[remote "origin"] - url = https://gitlab.com/gitlab-org/gitlab-ce.git - fetch = +refs/heads/*:refs/remotes/origin/* - fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* -``` - -Now you can fetch all the merge requests requests: - -``` -$ git fetch origin -From https://gitlab.com/gitlab-org/gitlab-ce.git - * [new ref] refs/merge-requests/1/head -> origin/merge-requests/1 - * [new ref] refs/merge-requests/2/head -> origin/merge-requests/2 -... -``` - -To check out a particular merge request: - -``` -$ git checkout origin/merge-requests/1 -``` |