koreno · HackerTrans

koreno

no profile record

Submissions

Git your blame in your Python Tracebacks

korenof.medium.com

5 pointsby koreno5 anni fa2 comments

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

gist.github.com

66 pointsby koreno11 anni fa20 comments

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

71 pointsby koreno11 anni fa36 comments

comments

koreno

5 anni fadiscuss

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

koreno

11 anni fadiscuss

Finally someone handles the challenge properly...

koreno

11 anni fadiscuss

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

11 anni fadiscuss

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

koreno

11 anni fadiscuss

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

11 anni fadiscuss

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

11 anni fadiscuss

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

koreno

11 anni fadiscuss

'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

11 anni fadiscuss

Nice! wasn't familiar was autostash.

koreno

11 anni fadiscuss

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

11 anni fadiscuss

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

koreno

11 anni fadiscuss

Yep, git inject uses this feature :)