TortoiseGit Manual Rebase

 

Rebasing commits takes places from the bottom of the list to the top (in ascending order of the ID column). For example, squash means that the commit gets squashed/combined with the previous commit(s) which are located below in the list (with a lower ID).

Tip

Instead of setting pick, skip, edit, squash by using the context-menu, you can also use the following keys: space: shifts the state, s: skip, e: edit, p: pick, q: squash

Tip

There is a button that swaps branch and upstream. Assume you are currently working on master branch, and wish to rebase feature branch onto master.  当然在master分支，想要把feature拼接到master后面

Instead of switching to feature in advance, select the commit of feature in log list, Context Menu → Rebase and click this swap button.

TortoiseGit's rebase moves feature to master directly, then cherry-picks the commits. This approach touches fewer files and runs faster.

 

 

 

作者:Chuck Lu    GitHub