search

fork-dev / Tracker

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

Please add the ability to fixup commits 🙏 #41

Closed vassilevsky closed 7 years ago

vassilevsky commented 7 years ago

Hello 🖖

Fork has great "Amend" functionality. But previous commits (before the last one) cannot be easily fixed up.

In SourceTree I added a custom command: git commit --fixup $SHA. It appears in commit context menu.

I can stage changes, switch to log, right-click a previous commit, and choose "Fixup this commit".

Then I rebase my branch with git rebase --autosqash and the commits are fixed.

It would have been nice to have similar functionality in Fork.

DanPristupov commented 7 years ago

Hi.

Why don't you use interactive rebase in this case?

  1. Commit your changes with some temporary message.
  2. Make interactive rebase to the commit before the one you want to edit.
  3. Fixup new commit into the target one.
  4. Press Rebase. Done

I can make a short GIF if you want.

DanPristupov commented 7 years ago

2017-06-02 at 17 05

vassilevsky commented 7 years ago

Wow I was not aware of this feature at all!

I will definitely try it.

DanPristupov commented 7 years ago

OK, it looks like I can close this.