koreno
I also renamed it 'git-prebase' so that it's easily added to git's autocomplete behavior and does not interfere with 'rebase'.
My original idea was to somehow show the actual conflicts, but then I figured this gets the desired 80% for 2% of the effort...
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.
Show HN: 'rebaser' improves on 'git rebase -i'
The point of the alias is to make it all more user-friendly and less error-prone.
Show HN: 'git inject' – amend commits other than HEAD
'git inject' is a git alias (see code at the bottom). It is similar to 'git commit --amend', but it allows you to 'inject' your changes into commits further back in history (using 'rebase').If you're as pedantic as I am about the git history you're about to push into master (as far as I can control it, I strive to keep each commit conceptually coherent), you'll often come to a situation where...