On Thu, Sep 08, 2011 at 04:12:04PM +0200, David Kastrup wrote: > > Well, I tried pushing a multi-commit change as a single merge commit > right now.
Thanks for the experiment! This is useful information for a long-away GOP proposal http://lilypond.org/~graham/gop/gop_19.html (currently "GOP h - separate branches for active development", but the url will change if I schedule it earlier) That said, I'm not completely clear on the difference between merging a branch, pulling from a branch, and this "multi-commit change" thing. > c) If you do "git log", you get the individual commits listed. However, > HEAD~1 refers to the state before the merge. So this should be > pretty much what is most convenient, in particular counting as a > single commit for bisecting (and reverting!). This could definitely be handy! > Overall, the results look reasonably consistent and usable. Given that > people are likely not too enthused digging into git's depth all too > much, I am not sure this is worth proposing as a general workflow. Well, as long as one git person can give us a reliable series of commands to do this, I think it's worth considering -- at least for large changes like beam collisions, or even "medium" changes like flag styles. Cheers, - Graham _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
