gitlab-org--gitlab-foss/doc/user/project/merge_requests/revert_changes.md

53 lines
1.8 KiB
Markdown
Raw Normal View History

2016-09-05 07:46:37 -04:00
# Reverting changes
> [Introduced][ce-1990] in GitLab 8.5.
GitLab implements Git's powerful feature to [revert any commit][git-revert]
2017-10-03 09:11:49 -04:00
with introducing a **Revert** button in merge requests and commit details.
2016-09-05 07:46:37 -04:00
## Reverting a Merge Request
2017-10-03 09:11:49 -04:00
NOTE: **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.
2016-09-05 07:46:37 -04:00
After the Merge Request has been merged, a **Revert** button will be available
2017-10-03 09:11:49 -04:00
to revert the changes introduced by that merge request.
2016-09-05 07:46:37 -04:00
2017-10-03 09:11:49 -04:00
![Revert Merge Request](img/cherry_pick_changes_mr.png)
2016-09-05 07:46:37 -04:00
2017-10-03 09:11:49 -04:00
After you click that button, a modal will appear where you can choose to
revert the changes directly into the selected branch or you can opt to
create a new merge request with the revert changes.
2016-09-05 07:46:37 -04:00
2017-10-03 09:11:49 -04:00
After the merge request has been reverted, the **Revert** button will not be
2016-09-05 07:46:37 -04:00
available anymore.
## Reverting a Commit
You can revert a Commit from the Commit details page:
2017-10-03 09:11:49 -04:00
![Revert commit](img/cherry_pick_changes_commit.png)
2016-09-05 07:46:37 -04:00
2017-10-03 09:11:49 -04:00
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.
2016-09-05 07:46:37 -04:00
2017-10-03 09:11:49 -04:00
After the commit has been reverted, the **Revert** button will not be available
2016-09-05 07:46:37 -04:00
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"