mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix instructions for squashing 

`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 62ae93b3a3
commit d9a98418f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 # 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 git rebase master
# fix all merge conflicts # fix all merge conflicts
git rebase --continue git rebase --continue