-
{{[[TODO]]}} just like regular rebase keeps track of the commits yet to do, we need to do the same for `branchSequencer` (branches). e.g.
-
a) user aborts mid-push, or
-
b) push fails and now user is stuck on a branch
-
c) etc
-
in all cases, we need to be able to `--continue`.
-
-
-
[[nvim-git-rebase-todo]]
-
{{[[TODO]]}} being able to have a shortcut to toggle the actual patch output would be good
-
{{[[TODO]]}} once hovering the "branch-end", instead of showing the branch's commit's stats, we could instead show the aggregate diff of the whole branch's commits (diff parent)
-
-
-
{{[[TODO]]}} oooh, `drop` doesn't work, but just removing the commit's line does. #[[(hidden) iZX-mgdkM]]
-
{{[[TODO]]}} hmm. double `fixup` one right after another doesn't work, but going 1 by 1 does (2 separate rebases). need to investigate. #[[(hidden) iZX-mgdkM]]
-
-
{{[[TODO]]}} "reword sugar" would be nice
-
-
{{[[TODO]]}} changing places of 2 branches doesn't seem to work - they stay in the same location. need to investigate. #[[(hidden) iZX-mgdkM]]
-
-
{{[[TODO]]}} when moving commits outside of the `branch-end-initial`, we could have 2 separate use cases:
-
1. if you moved a `branch-end` as well as some commits, then we "unstack" this branch - it becomes an independent one -- still based on `branch-end-initial`, but further branches in the stack are no longer based on it.
-
2. if you moved some commits, but __without__ a `branch-end` (and thus just deleted it, or kept it with fewer commits), then the commits become part of the `branch-end-initial` branch
-
2 rebases needed again, but at least here it should be easier, because no real extraction happens - we just move the commits earlier, but they're still part of the stack (rather, the stack is based on the same commits as before), so not as many (none?) conflicts to resolve.
-
i think [1] is a pre-requisite, since we need >1 rebase
-
-
-
{{[[TODO]]}} renaming branches would be nice -- could be another space and the new name of the branch
-
-
the issues w/ empty commits & wrong applies
-