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]
