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

1675 add a 'Squash your commits' header to 'Advanced Rebasing' section in git

This commit is contained in:
zahash 2023-08-29 15:32:12 +05:30 committed by Tshepang Mbambo
parent 2e94d2d71f
commit d01b87184f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/git.md
View File

@ -351,6 +351,8 @@ upstream.
## Advanced Rebasing ## Advanced Rebasing
### Squash your commits
If your branch contains multiple consecutive rewrites of the same code, or if If your branch contains multiple consecutive rewrites of the same code, or if
the rebase conflicts are extremely severe, you can use the rebase conflicts are extremely severe, you can use
`git rebase --interactive master` to gain more control over the process. This `git rebase --interactive master` to gain more control over the process. This