aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-07 09:01:48 +0000
committerGitHub <[email protected]>2021-01-07 09:01:48 +0000
commit1347b7fa4cdc2064ac1cb4a686f10890b9235893 (patch)
tree2229d37d10f874862fb7386ddc1009a403944041
parent959406aeb5379024bd7b2143688cfa07e073fc99 (diff)
parent08a1bcf9f860ba5b8c3bb3122ccbf3fa82d08811 (diff)
Merge #7189
7189: Extend git evacuation procedure r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--xtask/tests/tidy.rs14
1 files changed, 13 insertions, 1 deletions
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d1ffb70ad..7e5b1f7b5 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -107,8 +107,13 @@ When updating a pull-request, please rebase your feature branch
107on top of master by running `git rebase master`. If rebase fails, 107on top of master by running `git rebase master`. If rebase fails,
108you can re-apply your changes like this: 108you can re-apply your changes like this:
109 109
110 # Abort in-progress rebase, if any. 110 # Just look around to see the current state.
111 $ git status
112 $ git log
113
114 # Abort in-progress rebase and merges, if any.
111 $ git rebase --abort 115 $ git rebase --abort
116 $ git merge --abort
112 117
113 # Make the branch point to the latest commit from master, 118 # Make the branch point to the latest commit from master,
114 # while maintaining your local changes uncommited. 119 # while maintaining your local changes uncommited.
@@ -117,10 +122,17 @@ you can re-apply your changes like this:
117 # Commit all changes in a single batch. 122 # Commit all changes in a single batch.
118 $ git commit -am'My changes' 123 $ git commit -am'My changes'
119 124
125 # Verify that everything looks alright.
126 $ git status
127 $ git log
128
120 # Push the changes. We did a rebase, so we need `--force` option. 129 # Push the changes. We did a rebase, so we need `--force` option.
121 # `--force-with-lease` is a more safe (Rusty) version of `--force`. 130 # `--force-with-lease` is a more safe (Rusty) version of `--force`.
122 $ git push --force-with-lease 131 $ git push --force-with-lease
123 132
133 # Verify that both local and remote branch point to the same commit.
134 $ git log
135
124And don't fear to mess something up during a rebase -- you can 136And don't fear to mess something up during a rebase -- you can
125always restore the previous state using `git ref-log`: 137always restore the previous state using `git ref-log`:
126 138