On Fri, 5 Aug 2011, Michael Wood wrote:

> Yes, merging the commits... I'm not sure what the best way is to do that.

I finally got there but unfortunately I had just finished the rebase before
I received your email about the squash ;-)

I then ran in issues of trying to produce a single patch file that contained
all my changes rather than a patch file for each commit :(

Anyway, I found a couple of solutions but ended up having to create another
temporary branch, merge my changes from my smtp_ntlm branch into that branch
(squashing them along the way) and then committing the merge.

I will post the changes in a new email rather than to this thread so that
ppl can find it easily.

Steve

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2011-08-05