Michel Dänzer wrote:
On Mon, 2007-01-15 at 12:42 -0800, Eric Anholt wrote:
If you know what branch was merged before the git conversion that's
causing you your pain, one way forward might be to do:
git-checkout master
git pull -s ours . that-merged-branch
git pull . my-branch
It's more
Oh yes, and there is some magic to create a branch on the remote, right?
Am I able to do this myself or to I have to ask a grownup?
Nope.. just push the branch, like
git push origin my-new-branch:my-new-branch
Dave.
--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied /
On Mon, 2007-01-15 at 20:20 +, Keith Whitwell wrote:
Michel Dänzer wrote:
On Mon, 2007-01-15 at 17:35 +, Keith Whitwell wrote:
So, I decided it would be neat to merge all the changes that have
occurred on the Mesa mainline to the vbo branch where I've started
working again.
