|
From: | Trevor Daniels |
Subject: | Re: [PATCH] Enhancement: automatic polyphony in different \...Staffcontexts |
Date: | Sun, 23 Aug 2009 23:53:07 +0100 |
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
[Prev in Thread] | Current Thread | [Next in Thread] |