Our beautiful fake histories

Post by [deleted] » Sat, Jul 11, 2015, 4:44 AM UTC

nnutter wrote: post #10

scintill76 wrote: post #8

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 ce…

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…

Post by daxelrod » Sat, Jul 11, 2015, 4:52 PM UTC

scintill76 wrote: post #8

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 ce…

Post by scintill76 » Sun, Jul 12, 2015, 7:49 PM UTC

daxelrod wrote: post #13

scintill76 wrote: post #8

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 ce…

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.