Re:Show HN: 'rebaser' improves on 'git rebase -i'
by dhruvbird on Friday July 24, 2015 @11:11AM
(#9942511)
What does clashing column mean?
Re:Show HN: 'rebaser' improves on 'git rebase -i'
by Zikes on Friday July 24, 2015 @11:14AM
(#9942532)
Two commits touching the same file, represented by the identifier at the end of the rebase's commit line. If you look at each file as a column, you can see which commits would clash.
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.
Each file gets an alpha-numeric character at a particular column, a list of which appears below the commit list.
Commits can be moved up and down safely (no conflicts) as long as they don't have any clashing columns.