diff options
| author | Camelid <camelidcamel@gmail.com> | 2020-10-02 11:55:43 -0700 |
|---|---|---|
| committer | Joshua Nelson <joshua@yottadb.com> | 2020-10-02 15:08:28 -0400 |
| commit | 2571db38e46e97abfdf8b8ed6fd289875b7b4b1a (patch) | |
| tree | d64b3fd5ceb6bc7edf46c999fb4263d90fa28f79 /src/doc/rustc-dev-guide | |
| parent | c1c6dac0b51f167e63465f46e00d23af8cda5ab3 (diff) | |
| download | rust-2571db38e46e97abfdf8b8ed6fd289875b7b4b1a.tar.gz rust-2571db38e46e97abfdf8b8ed6fd289875b7b4b1a.zip | |
Fix instructions for squashing
`git merge-base master` does not work, you need `git merge-base master HEAD` instead.
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/git.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index 5f88235c2f6..633e7d5725e 100644 --- a/src/doc/rustc-dev-guide/src/git.md +++ b/src/doc/rustc-dev-guide/src/git.md @@ -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 |