Re:I Kind of Like Rebasing
by sam_bristow on Saturday June 22, 2024 @07:05PM
(#40763056)
This is my preferred branching model. Most forges seem to call it "semi-linear history". If you have a lot of people working on the repo you'll probably want a merge queue to handle landing PRs but that's pretty straight forward.
It works really well with things like git bisect. It also means history is actually useful.
That's the closest you get today but it means having to make, merge and delete branches all the time. What i propose is something like git squash but that keeps the history internally. It would present as one commit in gitk and other GUIs but could be expanded to see more detail.
Re:I Kind of Like Rebasing
by sam_bristow on Saturday June 22, 2024 @07:07PM
(#40763067)
Does gitk have an equivalent of `git log --first-parent`?
In the View menu dialog, there's a checkbox for "Limit to first parent"
Re:I Kind of Like Rebasing
by normie3000 on Sunday June 23, 2024 @01:32AM
(#40765035)
> it means having to make, merge and delete branches all the time
Isn't this something that git makes simple?
Is that not just a non-FF'd, non-squashed merge of a branch?