Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7189

Browse source 
7189: Extend git evacuation procedure r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-01-07 09:01:48 +00:00 committed by GitHub
commit 1347b7fa4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 @@ When updating a pull-request, please rebase your feature branch
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 @@ you can re-apply your changes like this:
# 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`: