mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend git evacuation procedure

Browse Source
This commit is contained in:
Aleksey Kladov 2021-01-07 12:00:07 +03:00
parent 7ae4b8bdb6
commit 08a1bcf9f8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xtask/tests/tidy.rs
View File

@ -107,8 +107,13 @@ fn check_merge_commits() {
on top of master by running `git rebase master`. If rebase fails,
you can re-apply your changes like this:
# Abort in-progress rebase, if any.
# Just look around to see the current state.
$ git status
$ git log
# Abort in-progress rebase and merges, if any.
$ git rebase --abort
$ git merge --abort
# Make the branch point to the latest commit from master,
# while maintaining your local changes uncommited.
@ -117,10 +122,17 @@ fn check_merge_commits() {
# Commit all changes in a single batch.
$ git commit -am'My changes'
# Verify that everything looks alright.
$ git status
$ git log
# Push the changes. We did a rebase, so we need `--force` option.
# `--force-with-lease` is a more safe (Rusty) version of `--force`.
$ git push --force-with-lease
# Verify that both local and remote branch point to the same commit.
$ git log
And don't fear to mess something up during a rebase -- you can
always restore the previous state using `git ref-log`: