Git rebase

From NovaOrdis Knowledge Base
Revision as of 20:46, 18 December 2020 by Ovidiu (talk | contribs) (→‎Options)
Jump to navigation Jump to search

Internal

Overview

git rebase reapplies commits on top of another base tip, removing the original commits. For more details on how rebasing works, and some concrete examples, see:

Git Rebasing

Options

--onto

git rebase --onto <newbase>

Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream> (what does that mean?). It may be any valid commit, not just an existing branch name.

--fork-point

The option that allows specifying the ancestor commit after which all commits will be rebased. Normally, this is implicitly calculated by git with:

git merge-base --fork-point <upstream> <branch>

command. If fork-point ends up being empty as result of this command, <upstream> will be used as fallback.

-i

Interactive rebase.