Add extracting, copying, and squashing commits to the rebase menu #1880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pre-fill `initial_text` if the user's selections *starts on* a (local) branch. This seems useful as we can put labels (branches) on commits in a branchless or stacked workflow to keep some overview about the distinct features, and then move them out "onto origin/main" quickly.
We have two case here. For the copy action, the rebase would get a no-op, as we copy commits to `ref` but then keep `ref` at the same position as before, basically overwriting what we did. Here name the olf ref `<ref>--old` for now. Of course a user has then to take action and probably have to delete that "--old" ref. But it helps understanding the process. Let's see how that works out. For the extract action, the rebase would be desastrous as we move the commits to the ref, *drop* the original commits, and then place the old `ref` at its old position. So we basically just loose the commits we wanted to extract. Here placing a `<ref>--old` label at the old position doesn't make sense as the old place is dropped and gone. So we just drop the old ref too. 🤞
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
👀
This probably makes the Rebase menu within the graph view feature complete to deprecate the rebase dashboard.