News for hackers. Stuff that matters.
Re:Our beautiful fake histories by nnutter on Friday July 10, 2015 @09:49PM (#9868145)
I think merge commits are sufficient but I thought a tool/script could help so I made [git-pinch][1]. It makes it easy to make merge commits without having to go through the trouble of making a branch. I wouldn't say others should necessarily use it but maybe it's a start. One thing merge commits add in complicating one's workflow is rebase requires options to preserve them and sometimes doesn't play nice.

[1]: https://github.com/nnutter/git-pinch

Re:Our beautiful fake histories by scintill76 on Sunday July 12, 2015 @03:40PM (#9874636)
That's a neat tool I'll keep in mind, thanks.