On 1/7/2012 12:17 AM, Reinhard Tartler wrote:
type: 'git rebase origin/master' and then try again.

That was my first effort, but it had another problem: I still have another commit in my tree (sent and disputed a few days ago). So I was trying to get the latest 6 patches using 'git format-patch HEAD~6' when I ran into this new problem.

btw, you might want to have a look at the manpage git-send-email(1),
which is effectively a front-end to format-patch for sending emails.

git-send-email is phase 2, after I get the right patches out using git-format-patch. If I combine the steps using just git-send-email, would I have the opportunity to make sure git pulled the correct patches?

--
    -Mike Melanson
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to