News for hackers. Stuff that matters.

koreno

Re:Git your blame in your Python Tracebacks on Friday May 07, 2021 @01:29AM (#27072531)
Git, Python, Tracebacks, Blame... need I say more?
Re:Show HN: DigData – convert SQL to MongoDB queries on Monday August 31, 2015 @12:31PM (#10147587)
Finally someone handles the challenge properly...
Re:Show HN: 'rebaser' improves on 'git rebase -i' on Monday August 03, 2015 @08:41AM (#9995296)
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'.

Re:Show HN: 'rebaser' improves on 'git rebase -i' on Saturday July 25, 2015 @05:35AM (#9947110)
Actually, there was a bug there, but now it's fixed.
Re:Show HN: 'rebaser' improves on 'git rebase -i' on Friday July 24, 2015 @06:12PM (#9945521)
couldn't find that specific commit for some reason... But I found the bug (indeed too many files, but I coped with it earlier...)
Re:Show HN: 'rebaser' improves on 'git rebase -i' 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...

Re:Show HN: 'rebaser' improves on 'git rebase -i' on Friday July 24, 2015 @01:42PM (#9943773)
The characters cycle (wrap-around), but since you have the columns intact that shouldn't be an issue... :)
Re:Show HN: 'rebaser' improves on 'git rebase -i' on Friday July 24, 2015 @10:05AM (#9942038)
'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.

Nice! wasn't familiar was autostash.
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.

The point of the alias is to make it more user-friendly and less error-prone.
Yep, git inject uses this feature :)

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

( Read More... | 36 comments | 71 points | on HN )