search

gmasterscm / ama

Ask me anything!
https://blog.sindresorhus.com/answering-anything-678ce5623798
5 stars 1 forks source link

Interactive rebase #18

Open pascalberger opened 6 years ago

pascalberger commented 6 years ago

Any plans for adding a UI for interactive rebases (for squashing or reordering commits or changing commit messages)?

psantosl commented 6 years ago

Yes! I've been working on this today, indeed :-P, studying how we are going to do it and coming up with some proposals.

Thoughts? :P

image

By the way, what is your favorite UI for dealing with interactive rebases now? SourceTree? Just want to double check.

pascalberger commented 6 years ago

@psantosl Would this also work for squashing, reordering and editing commit messages?

Currently I'm mostly using SourceTree, which IMHO has a quite nice and intuitive UI for interactive rebases (beside its overall slowness and bugs since 2.x)

psantosl commented 6 years ago

Yes, that's the idea: it would be straightforward to mark the action of each commit: pick, squash, reword, whatever... Reorder will be drag and drop.

SourceTree, ok, got it. I found it nearly unusable :P but it must be by its lack of visualization :-)

AngusMcIntyre commented 6 years ago

I find Sourcetree's interactive rebase UI horrible. Its hard to know exactly how it will behave and tricky to undo without totally restarting.

It would be fun to be able to drag and drop commit to re-order and squash. When squashing, I'd also like an orderable list on the 'squash' commit.