Elektrine lite

← Feed

@cjk@chaos.social

Post #1836250

2026-04-29 07:28 UTC

So I have finally a history rewtire features implemented: fixup / squash commits. But with some severe limitations: - working copy and index must be clean - no rebase / merge / cherry-pick may be in progress - all selected commits must be reachable from HEAD via first-parent walk - no commit between the oldest selected and HEAD (inclusive) may be a merge commit - the oldest selected commit must have a parent (cannot be the root commit) #gitte

Replies (1)

  • @cjk@chaos.social 2026-04-29 07:29

    I also do not have yet any conflict handling implemented, though that will be added when I add the edit feature. Rebasing is much, much more work than I thought.

    Open ##2573439