gitlab-ce/doc/workflow
Achilleas Pipinellis 7b0b241749 Merge branch 'patch-4' into 'master'
Update merge_requests.md with a simpler way to check out a merge request

## What does this MR do?

This MR updates `merge_requests.md` with a simpler way to check out a merge request 

The previous way was put under the "By modifying `.git/config` for a given repository" section. The disadvantage of the old way is that one has to modify `.git/config` for each repository that one uses. The new way was put under the "By adding a git alias" section. One has to create this git alias once, and then it will work from any repository, without having to modify `.git/config` over and over again.

## Are there points in the code the reviewer needs to double check?

One should double check that the link provided by the "Check out branch" button in a MR, i.e. https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally, still works. I think it will, since I didn't modify the "Checkout merge requests locally" section name.

## Why was this MR needed?

This MR was needed because the old way of checking out a merge request locally requires to modify `.git/config` in all repositories that one has on a computer, which is a tedious task. The new way just requires adding a simple git alias, once. And the `git mr` command then works for all repositories.

## What are the relevant issue numbers?

I haven't created an issue for this.

## Screenshots (if relevant)

N/A

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added (N/A)
- Tests
  - [ ] Added for this feature/bug (N/A)
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5944
2016-08-24 18:19:04 +00:00
..
add-user Fix a few nitpicks 2016-07-20 14:38:21 +02:00
forking optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
groups Improve the request / withdraw access button 2016-07-01 12:48:54 +02:00
img Refactor description templates documentation 2016-08-18 09:13:05 +03:00
importing Allow users to import cross-repository pull requests from GitHub 2016-08-04 17:16:50 -03:00
lfs Merge branch 'patch-1' into 'master' 2016-05-18 20:42:15 +00:00
merge_requests optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
merge_when_build_succeeds optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
milestones optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
notifications optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
releases optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
wip_merge_requests optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
README.md Merge branch 'issue-boards-doc' into 'master' 2016-08-22 15:20:27 +00:00
authorization_for_merge_requests.md
award_emoji.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
award_emoji.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
cherry_pick_changes.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
ci_mr.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
close_issue_mr.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
environment_branches.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
file_finder.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
forking_workflow.md Change URLs to new permissions.md location 2016-07-12 18:03:29 +03:00
four_stages.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
git_pull.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
gitdashflow.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
github_flow.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
gitlab_flow.md Fix typo in gitlab_flow.md 2016-08-23 17:02:58 +02:00
gitlab_flow.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
good_commit.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
groups.md Fix a few nitpicks 2016-07-20 14:38:21 +02:00
labels.md Move labels documentation to new location 2016-06-21 18:54:30 +02:00
merge_commits.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
merge_request.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
merge_requests.md Modify the alias to allow specifying a remote 2016-08-23 13:07:16 -06:00
merge_when_build_succeeds.md
messy_flow.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
milestones.md
mr_inline_comments.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
notifications.md Allow people to subscribe to mentions in updated MRs and Issues 2016-08-15 15:16:46 +01:00
production_branch.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
project_features.md
protected_branches.md Refactor protected branches documentation 2016-07-22 10:57:47 +03:00
rebase.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
release_branches.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
releases.md
remove_checkbox.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
revert_changes.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
share_projects_with_other_groups.md Allow project group links to be expired 2016-08-18 22:45:41 +01:00
share_with_group.md Bring share with group feature documentation from EE 2016-03-12 15:05:52 +01:00
share_with_group.png optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
shortcuts.md Convert shortcuts image into markdown 2016-08-03 12:22:05 -05:00
timezone.md
todos.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
web_editor.md Simplify feature introduction note 2016-08-08 11:44:55 +03:00
wip_merge_requests.md
workflow.md