Use reflog to find a better common ancestor between and when calculating which commits have been introduced by .
When –fork-point is active, fork_point will be used instead of to calculate the set of commits to rebase, where fork_point is the result of git merge-base –fork-point command (see git-merge-base(1)).
If fork_point ends up being empty, the will be used as a fallback.
If is given on the command line, then the default is –no-fork-point, otherwise the default is –fork-point.
See also rebase.forkpoint in git-config(1).
If your branch was based on but was rewound and your branch contains commits which were dropped, this option can be used with –keep-base in order to drop those commits from your branch.
–fork-point, –no-fork-point