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
c356fae5
Commit
c356fae5
authored
Jan 07, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"will be" -> "is"
parent
bdad266c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/_merge_request_settings.html.haml
app/views/projects/_merge_request_settings.html.haml
+2
-2
No files found.
app/views/projects/_merge_request_settings.html.haml
View file @
c356fae5
...
...
@@ -12,7 +12,7 @@
%strong
Merge commit
%br
%span
.descr
A merge commit
will be
created for every merge, and merging is allowed as long as there are no conflicts.
A merge commit
is
created for every merge, and merging is allowed as long as there are no conflicts.
.radio
=
label_tag
:project_merge_method_rebase_merge
do
...
...
@@ -20,7 +20,7 @@
%strong
Merge commit with semi-linear history
%br
%span
.descr
A merge commit
will be
created for every merge, but merging is only allowed if the branch has been rebased.
A merge commit
is
created for every merge, but merging is only allowed if the branch has been rebased.
This way you get a history that reads linearly (as with fast-forward merges), with the addition of merge commits.
%br
%span
.descr
...
...
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