git co trunk git svn rebase git co -BmyBranch ... do work & commits ... git co trunk git svn rebase git rebase myBranch git svn dcommit
On Thu, Oct 20, 2011 at 11:51 PM, Massimo Lusetti <[email protected]> wrote: > On Thu, Oct 20, 2011 at 4:48 PM, Howard Lewis Ship <[email protected]> wrote: > >> I create a new local branch for work, but don't dcommit it to >> apache.org; instead I rebase it onto the trunk and then git svn >> dcommit. > > This is what I've done: > git branch myBranch > git checkout myBranch > git commit -a ... > git checkout trunk > git merge myBranch > git svn rebase > git svn dcommit > > So I should have used git rebase instead of merge? Does it fast > forward any commit too? > > Thanks > -- > Massimo > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > -- Howard M. Lewis Ship Creator of Apache Tapestry The source for Tapestry training, mentoring and support. Contact me to learn how I can get you up and productive in Tapestry fast! (971) 678-5210 http://howardlewisship.com --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
