News for hackers. Stuff that matters.
Re:Show HN: 'rebaser' improves on 'git rebase -i' by pimlottc on Friday July 24, 2015 @11:39AM (#9942712)
Potentially clash; the commits may touch completely different parts of the same file without conflict.
Re:Show HN: 'rebaser' improves on 'git rebase -i' by branchless on Friday July 24, 2015 @01:54PM (#9943866)
This is the main prize. Using emacs + magit I can rebase and look at per commit files whilst having a buffer open to re-order commits.

In fact magit could probably do some of this with a hook on reordering commits which would not require more git metadata.

I'm not sure I care about any of this though as if I do rebase, reorder and then hit a conflict I can't resolve I can always abort the rebase.

Re:Show HN: 'rebaser' improves on 'git rebase -i' by koreno on Friday July 24, 2015 @01:44PM (#9943788)
True that!

My original idea was to somehow show the actual conflicts, but then I figured this gets the desired 80% for 2% of the effort...