News for hackers. Stuff that matters.
Re:Our beautiful fake histories by scintill76 on Friday July 10, 2015 @08:33PM (#9867903)
I've been thinking of a "sub-commit" concept, so a "beautiful, fake" commit that is atomic for most git operations, can be inspected more deeply, revealing bundled messy sub-commits that may be useful for understanding the history of that change. You get "every commit is a deliberately chosen, well-tested logical unit" as well as "present history as it actually happened." Maybe something like this can be done with certain branch/merge workflows, but I haven't seen it and don't understand git well enough to come up with it myself.
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.
Re:Our beautiful fake histories by daxelrod on Saturday July 11, 2015 @12:52PM (#9870491)
Are you familiar with Mercurial's Changeset Evolution? https://mercurial.selenic.com/wiki/ChangesetEvolution

It includes metadata that allows a changeset to be marked obsolete, and to provide successors.

Re:Our beautiful fake histories by scintill76 on Sunday July 12, 2015 @03:49PM (#9874673)
I wasn't familiar, and I'm not familiar with Mercurial in general, but that looks like it could help. Thanks, I'll keep it in mind.