Git rebase in depth

This’ll open your text editor with something like this:

This is the rebase plan, and by editing this file you can instruct git on how to edit history. We could do another interactive commit, but since we just want to include the rest of the changes in this commit we’ll just do this:

That last command tells git that we’re done editing this commit, and to continue to the next rebase command. The fix is thus:

The non-interactive rebase does the default operation for all implicated commits (“pick”)3, which simply rolls your history back to the last common anscestor and replays the commits from both branches.

Source: git-rebase.io