________________________________________ From: Trevor Daniels [t.dani...@treda.co.uk] Sent: Sunday, August 23, 2009 4:53 PM To: Mark Polesky; Carl Sorensen; Marc Hohl Cc: Lily-Devel List Subject: Re: [PATCH] Enhancement: automatic polyphony in different \...Staffcontexts
Mark Polesky wrote Sunday, August 23, 2009 11:16 PM > Carl Sorensen wrote: >> Here's what I recommend (I didn't used to do this, but it >> seems to be a better way to work). >> git branch newfeature >> git checkout newfeature >> git rebase -i master >> git rebase -I SHA1-ID-of-the-parent-of-branch-newfeature >> git checkout master >> git pull >> git cherry-pick newfeature >> git format-patch origin/master Not sure these rebases are necessary if you are going to use cherrypick rather than merge. I do: git branch newfeature git checkout newfeature edits etc git commit(s) git checkout master git pull git cherry-pick newfeature commit(s) git format-patch origin/master or git push Seems to work OK. Trevor -------------------------------- Yes, your method works OK. I use the rebase to get all of my work into a single commit, instead of having multiple commits to cherry-pick. It seems that git, like perl, has the implicit slogan TMTOWTDI (There's more than one way to do it). Carl _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
