3 ms·
(a) Because rebase is run on the branch to be rebased, but merge is run on the branch being merged to, that reverses the parents of the merge commit and puts it
by wnoise 4y ago
(a) Because rebase is run on the branch to be rebased, but merge is run on the branch being merged to, that reverses the parents of the merge commit and puts it on the rebased branch rather than the parent.
(b) Even if that were fixed, it alters the rebased branch, rather than stopping and warning in an unexpected case.
I really do want the natural semantics of merge --ff-only --no-ff.
- cerved 4y agoyou can do this git rebase -r target source && git checkout target && git merge --no-ff target since what your asking for is not a merge, you'd have glue it together by yourself. Perhaps, add it as a script