Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAdvice on how to add `squash` functionality to interactive rebase? #287
Comments
|
Hey @Lia-C -- youll probably want to modify the -- What if they are trying to squash a commit with children? youll have to reattach the other children Since there were so many edge cases I didnt bother implementing it myself :P the UI changes shouldnt be horrible, but I would try to code up the core functionality first |
|
I'm just going to use the same logic that git does for squashes. I suppose you didn't use actual git at all, and just rewrote the logic in js? Could you provide a quick overview of what parts of the rebase "rebaseInteractive", "userSpecifiedRebase", and "rebaseFinish" take care of? rebaseInteractiveThe logic I'd add would be in userSpecifiedRebaseRebaseInteractive first does something with
rebaseFInishRebaseInteractive then does rebaseFInish:
Would I need to change some things in |
git rebase -i <base>can currently onlypickcommits. I'm planning on changing thepickbutton into some kind of mutually-exclusive slider (or set of radio buttons) so that you can eitherpicka commit orsquasha commit.Do you have any advice on which files I would need to edit to add
squashfunctionality?I was looking at
src/js/git/commands.jsand I suspect I'll need to change something in this section:I'll also need to edit the pop-up interactive rebase dialog so that instead of a
pickbutton it has the mutually-exclusive slider/radio buttons.