search

fork-dev / Tracker

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

[Feature Request] rebase with --preserve-merges #616

Open 11janci opened 5 years ago

11janci commented 5 years ago

Hi!

Currently it is not possible (unless I'm missing sth) to do rebase with the --preserve-merges option from the UI, have to do it from the terminal. Would be nice to have a checkbox for it in the rebase confirmation dialog.

Big big thanks for your work guys, Fork absolutely rules! :)

jrodriguezva commented 5 years ago

Hi! I second the request! right now I have to use the terminal since most of the time I need the "--preserve-merge" option

DanPristupov commented 5 years ago

In 1.0.84 you can create a branch custom command for that.

Should be something like following (I didn't test it)

Screenshot 2019-09-23 at 11 25 12

It will be available in the branch context menu:

Screenshot 2019-09-23 at 11 26 13

OR in the Quick Launch dropdown (Cmd+P)

Screenshot 2019-09-23 at 11 26 43
jrodriguezva commented 5 years ago

Thank you so much for this, I didn't know but if i want do a interactive rebase with --preserve-merge and use the Fork UI, How could I do it?

DanPristupov commented 5 years ago

You can't. IR can only show a flat commit list and this is not going to be changed in the near future.

P.S. It looka like you should consider using --rebase-merges instead (https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---rebase-mergesrebase-cousinsno-rebase-cousins)

k-spa commented 4 years ago

When doing an interactive rebase with --rebase-merges, wouldn't it be possible for the popup to still show a flat commit list with only the merge commit present? Just hide all the information about the commits behind that merge commit, I'm not interested in them anyway - otherwise I wouldn't use --rebase-merges.

k-spa commented 4 years ago

Any updates on this issue? It's a persistent problem in our team and always having to work around this by using the console gets really annoying over time.