user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix instructions for squashing

Browse source 
`git merge-base master` does not work, you need
`git merge-base master HEAD` instead.
This commit is contained in:
Camelid 2020-10-02 11:55:43 -07:00 • committed by Joshua Nelson
parent c1c6dac0b5
commit 2571db38e4
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/doc/rustc-dev-guide/src/git.md
View file

@ -160,7 +160,7 @@ Alternatively, you can sacrifice the commit history like this:
```
# squash all the changes into one commit so you only have to worry about conflicts once
git rebase -i $(git merge-base master) # and squash all changes along the way
git rebase -i $(git merge-base master HEAD) # and squash all changes along the way
git rebase master
# fix all merge conflicts
git rebase --continue