diff options
author | Robert Speicher <robert@gitlab.com> | 2016-02-19 21:39:31 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-19 21:55:19 +0300 |
commit | 0daef5bfd780427c2f76fcd750cbecf7e0a5f575 (patch) | |
tree | 4b29d8fc43e368637bdadffc740a1bc44ffb9a26 /doc/workflow/revert_changes.md | |
parent | 441896589efd9d2730e7c0598ea23eef6eab8aad (diff) |
Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits
Closes #3409
See merge request !1990
Diffstat (limited to 'doc/workflow/revert_changes.md')
-rw-r--r-- | doc/workflow/revert_changes.md | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/doc/workflow/revert_changes.md b/doc/workflow/revert_changes.md new file mode 100644 index 00000000000..399366b0cdc --- /dev/null +++ b/doc/workflow/revert_changes.md @@ -0,0 +1,64 @@ +# Reverting changes + +_**Note:** This feature was [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" |