From e14c7eabb76c5ba7a88b0785ec0def622d9fb64f Mon Sep 17 00:00:00 2001 From: zahash Date: Tue, 29 Aug 2023 15:32:12 +0530 Subject: [PATCH] 1675 add a 'Squash your commits' header to 'Advanced Rebasing' section in git --- src/doc/rustc-dev-guide/src/git.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index 6c5c64685498..579459bdf24a 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