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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
a8ba5840
Commit
a8ba5840
authored
Sep 05, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move revert_changes.md to new location
parent
14a96a1a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
65 deletions
+66
-65
doc/intro/README.md
doc/intro/README.md
+1
-1
doc/user/project/merge_requests/img/revert_changes_commit.png
...user/project/merge_requests/img/revert_changes_commit.png
+0
-0
doc/user/project/merge_requests/img/revert_changes_commit_modal.png
...roject/merge_requests/img/revert_changes_commit_modal.png
+0
-0
doc/user/project/merge_requests/img/revert_changes_mr.png
doc/user/project/merge_requests/img/revert_changes_mr.png
+0
-0
doc/user/project/merge_requests/img/revert_changes_mr_modal.png
...er/project/merge_requests/img/revert_changes_mr_modal.png
+0
-0
doc/user/project/merge_requests/revert_changes.md
doc/user/project/merge_requests/revert_changes.md
+64
-0
doc/workflow/revert_changes.md
doc/workflow/revert_changes.md
+1
-64
No files found.
doc/intro/README.md
View file @
a8ba5840
...
...
@@ -24,7 +24,7 @@ Create merge requests and review code.
-
[
Create a new merge request
](
../gitlab-basics/add-merge-request.md
)
-
[
Automatically close issues from merge requests
](
../customization/issue_closing.md
)
-
[
Automatically merge when your builds succeed
](
../user/project/merge_requests/merge_when_build_succeeds.md
)
-
[
Revert any commit
](
../
workflow
/revert_changes.md
)
-
[
Revert any commit
](
../
user/project/merge_requests
/revert_changes.md
)
-
[
Cherry-pick any commit
](
../user/project/merge_requests/cherry_pick_changes.md
)
## Test and Deploy
...
...
doc/
workflow
/img/revert_changes_commit.png
→
doc/
user/project/merge_requests
/img/revert_changes_commit.png
View file @
a8ba5840
File moved
doc/
workflow
/img/revert_changes_commit_modal.png
→
doc/
user/project/merge_requests
/img/revert_changes_commit_modal.png
View file @
a8ba5840
File moved
doc/
workflow
/img/revert_changes_mr.png
→
doc/
user/project/merge_requests
/img/revert_changes_mr.png
View file @
a8ba5840
File moved
doc/
workflow
/img/revert_changes_mr_modal.png
→
doc/
user/project/merge_requests
/img/revert_changes_mr_modal.png
View file @
a8ba5840
File moved
doc/user/project/merge_requests/revert_changes.md
0 → 100644
View file @
a8ba5840
# Reverting changes
> [Introduced][ce-1990] in GitLab 8.5.
---
GitLab implements Git's powerful feature to
[
revert any commit
][
git-revert
]
with introducing a
**Revert**
button in Merge Requests and commit details.
## Reverting a Merge Request
_
**Note:**
The
**Revert**
button will only be available for Merge Requests
created since GitLab 8.5. However, you can still revert a Merge Request
by reverting the merge commit from the list of Commits page._
After the Merge Request has been merged, a
**Revert**
button will be available
to revert the changes introduced by that Merge Request:
![
Revert Merge Request
](
img/revert_changes_mr.png
)
---
You can revert the changes directly into the selected branch or you can opt to
create a new Merge Request with the revert changes:
![
Revert Merge Request modal
](
img/revert_changes_mr_modal.png
)
---
After the Merge Request has been reverted, the
**Revert**
button will not be
available anymore.
## Reverting a Commit
You can revert a Commit from the Commit details page:
![
Revert commit
](
img/revert_changes_commit.png
)
---
Similar to reverting a Merge Request, you can opt to revert the changes
directly into the target branch or create a new Merge Request to revert the
changes:
![
Revert commit modal
](
img/revert_changes_commit_modal.png
)
---
After the Commit has been reverted, the
**Revert**
button will not be available
anymore.
Please note that when reverting merge commits, the mainline will always be the
first parent. If you want to use a different mainline then you need to do that
from the command line.
Here is a quick example to revert a merge commit using the second parent as the
mainline:
```
bash
git revert
-m
2 7a39eb0
```
[
ce-1990
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1990
"Revert button Merge Request"
[
git-revert
]:
https://git-scm.com/docs/git-revert
"Git revert documentation"
doc/workflow/revert_changes.md
View file @
a8ba5840
# Reverting changes
> [Introduced][ce-1990] in GitLab 8.5.
---
GitLab implements Git's powerful feature to
[
revert any commit
][
git-revert
]
with introducing a
**Revert**
button in Merge Requests and commit details.
## Reverting a Merge Request
_
**Note:**
The
**Revert**
button will only be available for Merge Requests
created since GitLab 8.5. However, you can still revert a Merge Request
by reverting the merge commit from the list of Commits page._
After the Merge Request has been merged, a
**Revert**
button will be available
to revert the changes introduced by that Merge Request:
![
Revert Merge Request
](
img/revert_changes_mr.png
)
---
You can revert the changes directly into the selected branch or you can opt to
create a new Merge Request with the revert changes:
![
Revert Merge Request modal
](
img/revert_changes_mr_modal.png
)
---
After the Merge Request has been reverted, the
**Revert**
button will not be
available anymore.
## Reverting a Commit
You can revert a Commit from the Commit details page:
![
Revert commit
](
img/revert_changes_commit.png
)
---
Similar to reverting a Merge Request, you can opt to revert the changes
directly into the target branch or create a new Merge Request to revert the
changes:
![
Revert commit modal
](
img/revert_changes_commit_modal.png
)
---
After the Commit has been reverted, the
**Revert**
button will not be available
anymore.
Please note that when reverting merge commits, the mainline will always be the
first parent. If you want to use a different mainline then you need to do that
from the command line.
Here is a quick example to revert a merge commit using the second parent as the
mainline:
```
bash
git revert
-m
2 7a39eb0
```
[
ce-1990
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1990
"Revert button Merge Request"
[
git-revert
]:
https://git-scm.com/docs/git-revert
"Git revert documentation"
This document was moved to
[
user/project/merge_requests/revert_changes
](
../user/project/merge_requests/revert_changes.md
)
.
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