Skip to content

Remove requests or suggestions about rebase and fixup contradictory to rust-highfive bot comment #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove suggestions about rebase to fixup or add additional changes re…
…quested

To avoid confusion with the recommendation of rust-highfive bot
  • Loading branch information
jhg committed Apr 18, 2021
commit 2b47fd360de669dce8013fb2c7cbfb84b118875b
6 changes: 2 additions & 4 deletions src/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,7 @@ rebase! Use `git push --force-with-lease` instead.

## Advanced Rebasing

If your branch contains multiple consecutive rewrites of the same code, or if
the rebase conflicts are extremely severe, you can use
If your branch conflicts are extremely severe, you can use
`git rebase --interactive master` to gain more control over the process. This
allows you to choose to skip commits, edit the commits that you do not skip,
change the order in which they are applied, or "squash" them into each other.
Expand All @@ -259,8 +258,7 @@ commit. Both the upside and downside of this is that it simplifies the history.
On the one hand, you lose track of the steps in which changes were made, but
the history becomes easier to work with.

You also may want to squash just the last few commits together, possibly
because they only represent "fixups" and not real changes. For example,
You also may want to squash just the last few commits together. For example,
`git rebase --interactive HEAD~2` will allow you to edit the two commits only.

## No-Merge Policy
Expand Down