Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
23aaef3b
Commit
23aaef3b
authored
May 08, 2018
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolves conflicts in repository_mirroring.md
parent
aa00e1b0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
doc/workflow/repository_mirroring.md
doc/workflow/repository_mirroring.md
+3
-2
No files found.
doc/workflow/repository_mirroring.md
View file @
23aaef3b
...
@@ -231,7 +231,7 @@ period will be penalized each time it fails up to a maximum amount of time.
...
@@ -231,7 +231,7 @@ period will be penalized each time it fails up to a maximum amount of time.
## Pushing to a remote repository **[STARTER]**
## Pushing to a remote repository **[STARTER]**
>[Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249) in
>[Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249) in
GitLab Enterprise Edition 8.7.
GitLab Enterprise Edition 8.7.
[
Moved to GitLab Community Edition
][
ce-18715
]
in 10.8.
For an existing project, you can set up push mirror from your project's
For an existing project, you can set up push mirror from your project's
**Settings ➔ Repository**
and searching for the "Push to a remote repository"
**Settings ➔ Repository**
and searching for the "Push to a remote repository"
...
@@ -259,7 +259,7 @@ repository_mirroring/repository_mirroring_diverged_branch_push.png)
...
@@ -259,7 +259,7 @@ repository_mirroring/repository_mirroring_diverged_branch_push.png)
### Push only protected branches
### Push only protected branches
>[Introduced][ee-3350] in GitLab Enterprise Edition 10.3.
>[Introduced][ee-3350] in GitLab Enterprise Edition 10.3.
[Moved to GitLab Community Edition][ce-18715] in 10.8.
You can choose to only push your protected branches from GitLab to your remote repository.
You can choose to only push your protected branches from GitLab to your remote repository.
...
@@ -339,6 +339,7 @@ limitations of GitFusion.
...
@@ -339,6 +339,7 @@ limitations of GitFusion.
[
ee-3326
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3326
[
ee-3326
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3326
[
ee-3350
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3350
[
ee-3350
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3350
[
ee-3453
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3453
[
ee-3453
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3453
[
ce-18715
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18715
[
perms
]:
../user/permissions.md
[
perms
]:
../user/permissions.md
[
hooks
]:
../administration/custom_hooks.html
[
hooks
]:
../administration/custom_hooks.html
[
deploy-key
]:
../ssh/README.md#deploy-keys
[
deploy-key
]:
../ssh/README.md#deploy-keys
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment