cURL / Mailing Lists / curl-library / Single Mail


Re: [PATCH] Added AUTH NTLM for SMTP (Part 2)

From: Michael Wood <>
Date: Fri, 5 Aug 2011 11:45:39 +0200


On 5 August 2011 10:54, Steve Holme <> wrote:
> Hi Yang,
> On Thu, 4 Aug 2011, Yang Tse wrote:
>> Could you provide a single consolidated patch rebased at tonight's git ?
>> Taking in account that ...
> No problem. I have updated my branch with your suggestions and am able to
> provide a consolidated patch as requested.
> However, I am still getting to grips with Git (Well... TortoiseGit) and am
> struggling to with some of the terminology and understanding of how to
> catch-up from trunk / main / master. As you can problem tell, I am a long
> time TortoiseSVN, ClearCase and even have to admit it, SourceSafe user ;-)
> From what you mentioned, I thought I should be able to perform a rebase but
> I have committed my changes to my branch and as such am being warned:
> Current branch smtp_ntlm is up to date
> If you want to force the rebase even if the current branch is a descendent
> of the commit you are rebasing onto, please check "Force Rebase" checkbox
> Is this what I need to do, or is there another command I should be using to
> catch-up?

I've not used TortoiseGit, so I'm not sure exactly what you're doing.

Basically, you should be doing a "git fetch" (or "git fetch origin
master") to update the origin/master remote branch to the latest
version. Then you should rebase your current branch onto

Michael Wood <>
List admin:
Received on 2011-08-05