search

fork-dev / Tracker

Bug and issue tracker for Fork for Mac
509 stars 12 forks source link

[Feature Request] Interactive Rebase highlight related commits #1940

Open joevt opened 1 year ago

joevt commented 1 year ago

During Interactive Rebase of several commits, it may be helpful to highlight other commits that have changes to the same files as the currently selected commit. Perhaps independent commits can have their own color.

DanPristupov commented 1 year ago

I don't understand how to show that in a clear intuitive way. Can you show a mockup?

joevt commented 1 year ago

How about something like this:

In a column on the left or right side of the action menu button (Pick, Edit, etc) for each commit, display a single character indicator that shows if the set of files of the commit is identical to (=), a subset of (<) , superset of (>) , or intersects (∩) the set of files in the currently selected commit (or multiple selected commits if more than one is selected).

Optionally or alternatively, a column that lists the files in the commit might be helpful so the user doesn't need to select each commit to know what files it modifies.

The suggested changes may help in reordering and merging related commits.