Git Rebase: The Power Tool for Clean Git Histories

$ git checkout feature

# switch to the feature branch



$ git rebase master

# apply the commits from the feature branch on top of the latest commits in the master branch



# If there are conflicts during the rebase, you will need to resolve them

# and then use `git add` to mark the resolved files, and then use

# `git rebase --continue` to continue the rebase.



$ git push -f origin feature

# push the feature branch to the remote repository, using the -f flag to force the push

# (necessary because the commit history of the feature branch has been modified by the rebase)

$ git checkout feature

# switch to the feature branch



$ git rebase -i HEAD~3

# interactively rebase the last 3 commits



# This will open a text editor, showing the list of commits that will be modified by the rebase.

# You can use the `squash` command to merge commits together. For example:

#

# pick abcdefg Some commit message

# squash hijklmn Another commit message

# squash opqrstu Yet another commit message



# Save and close the editor. Git will then apply the changes and open another editor

# for you to modify the commit message of the combined commit.



$ git push -f origin feature

# push the feature branch to the remote repository, using the -f flag to force the push

# (necessary because the commit history of the feature branch has been modified by the rebase)