diff options
| author | zahash <zahash.z@gmail.com> | 2023-08-29 15:32:12 +0530 |
|---|---|---|
| committer | Tshepang Mbambo <tshepang@gmail.com> | 2023-08-30 10:02:41 +0200 |
| commit | e14c7eabb76c5ba7a88b0785ec0def622d9fb64f (patch) | |
| tree | df49b71fb6078212bccaa63bf6179bd3836036ed /src/doc/rustc-dev-guide | |
| parent | 5c1c8098b92d359d409521b8f52e3aec0c97bd3d (diff) | |
| download | rust-e14c7eabb76c5ba7a88b0785ec0def622d9fb64f.tar.gz rust-e14c7eabb76c5ba7a88b0785ec0def622d9fb64f.zip | |
1675 add a 'Squash your commits' header to 'Advanced Rebasing' section in git
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/git.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index 6c5c6468549..579459bdf24 100644 --- a/src/doc/rustc-dev-guide/src/git.md +++ b/src/doc/rustc-dev-guide/src/git.md @@ -351,6 +351,8 @@ upstream. ## Advanced Rebasing +### Squash your commits + If your branch contains multiple consecutive rewrites of the same code, or if the rebase conflicts are extremely severe, you can use `git rebase --interactive master` to gain more control over the process. This |