move it "back in time", use git-rebase (1). Note that the last point clashes ... RECOVERING FROM UPSTREAM REBASE in git-rebase (1). We should point out that "habitually" (regularlythat. See the NOTES section in git-rebase (1) for more details. HOOKSmerge between local branches. • git-rebase (1) to maintain topic branches. • git