diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 11:13:30 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-19 11:13:30 +0200 |
| commit | 067673fbe7466ae00b9ef1f66c53cb4bfb0d4090 (patch) | |
| tree | 9f580a0828df58dca4f73a54e5e59c27bf81e8a8 /doc/workflow | |
| parent | 2178647a914ce24f0f2817c750a14c0e7996c96f (diff) | |
| parent | 72a425fa6656b397feb6c4d5bfec7b251cf2675d (diff) | |
| download | gitlab-ce-067673fbe7466ae00b9ef1f66c53cb4bfb0d4090.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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, 41 insertions, 0 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 42490bd6e3c..f14eb833eeb 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -20,4 +20,5 @@ - [Share projects with other groups](share_projects_with_other_groups.md) - [Two-factor Authentication (2FA)](two_factor_authentication.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 new file mode 100644 index 00000000000..751e19da7f1 --- /dev/null +++ b/doc/workflow/merge_requests.md @@ -0,0 +1,40 @@ +# 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 +``` |