debian-mirror-gitlab/doc/user/project/repository/branches/index.md

144 lines
6 KiB
Markdown
Raw Normal View History

2019-10-12 21:52:04 +05:30
---
2020-10-24 23:57:45 +05:30
stage: Create
group: Source Code
2021-02-22 17:27:13 +05:30
info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
2019-10-12 21:52:04 +05:30
type: concepts, howto
---
2017-09-10 17:25:29 +05:30
# Branches
2019-10-12 21:52:04 +05:30
A branch is a version of a project's working tree. You create a branch for each
set of related changes you make. This keeps each set of changes separate from
each other, allowing changes to be made in parallel, without affecting each
other.
After pushing your changes to a new branch, you can:
- Create a [merge request](../../merge_requests/index.md)
- Perform inline code review
- [Discuss](../../../discussions/index.md) your implementation with your team
- Preview changes submitted to a new branch with [Review Apps](../../../../ci/review_apps/index.md).
With [GitLab Starter](https://about.gitlab.com/pricing/), you can also request
[approval](../../merge_requests/merge_request_approvals.md) from your managers.
For more information on managing branches using the GitLab UI, see:
- [Default branches](#default-branch)
- [Create a branch](../web_editor.md#create-a-new-branch)
- [Protected branches](../../protected_branches.md#protected-branches)
- [Delete merged branches](#delete-merged-branches)
- [Branch filter search box](#branch-filter-search-box)
You can also manage branches using the
[command line](../../../../gitlab-basics/start-using-git.md#create-a-branch).
2018-03-17 18:26:18 +05:30
2019-10-12 21:52:04 +05:30
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>Watch the video [GitLab Flow](https://www.youtube.com/watch?v=InKNIvky2KE).
2018-03-17 18:26:18 +05:30
See also:
2019-03-02 22:35:43 +05:30
- [Branches API](../../../../api/branches.md), for information on operating on repository branches using the GitLab API.
2019-10-12 21:52:04 +05:30
- [GitLab Flow](../../../../university/training/gitlab_flow.md) documentation.
2019-03-02 22:35:43 +05:30
- [Getting started with Git](../../../../topics/git/index.md) and GitLab.
2018-03-17 18:26:18 +05:30
## Default branch
When you create a new [project](../../index.md), GitLab sets `master` as the default
2020-07-28 23:09:34 +05:30
branch of the repository. You can choose another branch to be your project's
2018-11-20 20:47:30 +05:30
default under your project's **Settings > Repository**.
2018-03-17 18:26:18 +05:30
2020-07-28 23:09:34 +05:30
When closing issues directly from merge requests through the [issue closing pattern](../../issues/managing_issues.md#closing-issues-automatically),
the target is the project's **default branch**.
2018-03-17 18:26:18 +05:30
2020-07-28 23:09:34 +05:30
The default branch is also initially [protected](../../protected_branches.md#protected-branches)
against accidental deletion and forced pushes.
### Custom initial branch name **(CORE ONLY)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221013) in GitLab 13.2.
> - It's deployed behind a feature flag, enabled by default.
> - It's enabled on GitLab.com.
> - It cannot be enabled or disabled per-project.
> - It's recommended for production use.
2020-11-24 15:15:51 +05:30
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-custom-initial-branch-name). **(CORE ONLY)**
2020-07-28 23:09:34 +05:30
By default, when you create a new project in GitLab, the initial branch is called `master`.
For self-managed instances, a GitLab administrator can customize the initial branch name to something
else. This way, every new project created from then on will start from the custom branch name rather than `master`. To do so:
2020-10-24 23:57:45 +05:30
1. Go to the **Admin Area > Settings > Repository** and expand **Default initial
2020-07-28 23:09:34 +05:30
branch name**.
1. Change the default initial branch to a custom name of your choice.
1. **Save Changes**.
#### Enable or disable custom initial branch name **(CORE ONLY)**
Setting the default initial branch name is under development but ready for production use.
It is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../../../administration/feature_flags.md)
can opt to disable it for your instance.
To disable it:
```ruby
Feature.disable(:global_default_branch_name)
```
To enable it:
```ruby
Feature.enable(:global_default_branch_name)
```
2018-03-17 18:26:18 +05:30
2019-10-12 21:52:04 +05:30
## Compare
To compare branches in a repository:
1. Navigate to your project's repository.
1. Select **Repository > Compare** in the sidebar.
1. Select branches to compare using the [branch filter search box](#branch-filter-search-box)
1. Click **Compare** to view the changes inline:
![compare branches](img/compare_branches.png)
2017-09-10 17:25:29 +05:30
## Delete merged branches
2020-03-13 15:44:24 +05:30
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6449) in GitLab 8.14.
2017-09-10 17:25:29 +05:30
![Delete merged branches](img/delete_merged_branches.png)
This feature allows merged branches to be deleted in bulk. Only branches that
2018-12-13 13:39:08 +05:30
have been merged and [are not protected](../../protected_branches.md) will be deleted as part of
2017-09-10 17:25:29 +05:30
this operation.
2018-03-17 18:26:18 +05:30
It's particularly useful to clean up old branches that were not deleted
2017-09-10 17:25:29 +05:30
automatically when a merge request was merged.
2018-12-13 13:39:08 +05:30
## Branch filter search box
2020-03-13 15:44:24 +05:30
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22166) in GitLab 11.5.
2018-12-13 13:39:08 +05:30
![Branch filter search box](img/branch_filter_search_box.png)
This feature allows you to search and select branches quickly. Search results appear in the following order:
- Branches with names that matched search terms exactly.
- Other branches with names that include search terms, sorted alphabetically.
Sometimes when you have hundreds of branches you may want a more flexible matching pattern. In such cases you can use the following:
- `^feature` will only match branch names that begin with 'feature'.
- `feature$` will only match branch names that end with 'feature'.
2019-10-12 21:52:04 +05:30
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->