gitlab-org--gitlab-foss/doc
Achilleas Pipinellis 2f344eca42 Merge branch 'master' into 'master'
Update start-using-git.md to reflect that merges to master can be made from either the master or the named branch.

## What does this MR do?

The documentation is incorrect in stating that you need to be in the named branch in order to merge to master.  You can be in master and merge the named branch, too.

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

Yes

## Why was this MR needed?

This MR is needed to correct an inaccuracy in the documentation.

## What are the relevant issue numbers?

N/A

## Screenshots (if relevant)

N/A

## Does this MR meet the acceptance criteria?

It is only a documentation change, so mostly this is not applicable.

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

See merge request !5404
2016-08-01 06:56:16 +00:00
..
administration
api
ci
container_registry
customization
development
downgrade_ee_to_ce
gitlab-basics
hooks
incoming_email
install
integration
intro
legal
logs
markdown
migrate_ci_to_ce
monitoring
operations
permissions
profile
project_services
public_access
raketasks Clarify backup_keep_time config parameter with S3 2016-07-29 07:32:37 -07:00
security
ssh
system_hooks
update
user
web_hooks
workflow
README.md

README.md

Documentation

User documentation

Administrator documentation

Contributor documentation

  • Documentation styleguide Use this styleguide if you are contributing to documentation.
  • Development Explains the architecture and the guidelines for shell commands.
  • Legal Contributor license agreements.