News for hackers. Stuff that matters.
Re:Extremely Linear Git History by wnoise on Tuesday November 22, 2022 @01:40PM (#33709325)
Yes, it is a shame that you can't combine git merge --ff-only --no-ff .
Re:Extremely Linear Git History by cerved on Tuesday November 22, 2022 @04:31PM (#33711787)
git rebase && git merge --no--ff
Re:Extremely Linear Git History by wnoise on Tuesday November 22, 2022 @07:05PM (#33713302)
(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.

Re:Extremely Linear Git History by cerved on Wednesday November 23, 2022 @02:22AM (#33716195)
you 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