koreno · HackerTrans

koreno

no profile record

Submissions

Git your blame in your Python Tracebacks

korenof.medium.com

5 pointsby korenovor 5 Jahren2 comments

Show HN: 'rebaser' improves on 'git rebase -i'

gist.github.com

66 pointsby korenovor 11 Jahren20 comments

Show HN: 'git inject' – amend commits other than HEAD

71 pointsby korenovor 11 Jahren36 comments

comments

koreno

vor 5 Jahrendiscuss

Git, Python, Tracebacks, Blame... need I say more?

koreno

vor 11 Jahrendiscuss

Finally someone handles the challenge properly...

koreno

vor 11 Jahrendiscuss

At the request of some users, this is now a proper github project: https://github.com/koreno/prebase

I also renamed it 'git-prebase' so that it's easily added to git's autocomplete behavior and does not interfere with 'rebase'.

koreno

vor 11 Jahrendiscuss

Actually, there was a bug there, but now it's fixed.

koreno

vor 11 Jahrendiscuss

couldn't find that specific commit for some reason... But I found the bug (indeed too many files, but I coped with it earlier...)

koreno

vor 11 Jahrendiscuss

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...

koreno

vor 11 Jahrendiscuss

The characters cycle (wrap-around), but since you have the columns intact that shouldn't be an issue... :)

koreno

vor 11 Jahrendiscuss

'rebaser' improves on 'git rebase -i' by adding information per commit regarding which files it touched.

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.

koreno

vor 11 Jahrendiscuss

Nice! wasn't familiar was autostash.

koreno

vor 11 Jahrendiscuss

It gets more complicated if you have some other modified content that you wanna leave untouched. You then need to stash it or commit it separately.

The point of the alias is to make it all more user-friendly and less error-prone.

koreno

vor 11 Jahrendiscuss

The point of the alias is to make it more user-friendly and less error-prone.

koreno

vor 11 Jahrendiscuss

Yep, git inject uses this feature :)