-f, --force-rebase
Force the rebase even if the current branch is a descendant of the commit you are rebasing onto.
Normally non-interactive rebase will exit with the message "Current branch is up to date" in such a
situation. Incompatible with the --interactive option.
You may find this (or --no-ff with an interactive rebase) helpful after reverting a topic branch
merge, as this option recreates the topic branch with fresh commits so it can be remerged
successfully without needing to "revert the reversion" (see the revert-a-faulty-merge How-To[1] for
details).
|