-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 12/31/2012 09:33 AM, Nico Williams wrote:
> I'm very glad you mentioned this. I really would like git rebase (and > any equivalents in other VCSes) to add an empty commit whose message > contains: the old base commit hash, the new base commit has, and the > rebase recipe (i.e., the pick/squash/fixup/edit/... instructions, > including the commit hashes of dropped commits). That reminds me of a discussion I had with a dyed-in-the-wool git fan, of the "make the history beautiful" camp, who was a fan of making lots of tiny commits during development but then squashing them into a single neat patch to go onto the trunk. I was nervous about the history-loss this created, and one idea that I suggested as a compromise between our positions was a special kind of merge commit in the history that looked like a single commit containing the entire branch as a single patch in the UI, rather than like a merge of the "topic branch" containing the work. This would appear like rebasing the topic branch and squashing all the commits, but was actually just a merge in all respects other than how it looked in the timeline. Might that be a useful approach for Fossil, too? ABS - -- Alaric Snell-Pym http://www.snell-pym.org.uk/alaric/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAlDluxYACgkQRgz/WHNxCGp4HQCghgq9q1JuvzndW3tlkj0zXNS1 2XsAn0GS6hdXXtvj0C7aXBWvoDYDidjL =S55G -----END PGP SIGNATURE----- _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
