From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 22 Jun 2008 14:01:59 GMT
Subject: Re: "git-pull --no-commit" should imply --no-ff...?
Message-ID: <485E5B57.5000307@s5r6.in-berlin.de>
In-Reply-To: <20080622133606.GA21828@endor.mknod.org>

Graham Wilson wrote:
> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
>> trying "git pull --no-commit . foo" for the first time, I was confused
>> that --no-commit was a no-op when the pull resulted in a fast-forward.
>> I.e. HEAD advanced the whole chain of commits to foo.  I expected it to
>> apply the diff of HEAD..foo but not commit them.
> 
> --no-commit to me seems to mean don't commit a merge commit. Maybe what
> you want is something like:
> 
>  git-diff HEAD foo | git-apply
> 

Yes, I obviously got the wrong idea about git-pull --no-commit.
git-diff + git-apply indeed accomplishes what I wanted to do.  Thanks,
-- 
Stefan Richter
-=====-==--- -==- =-==-
http://arcgraph.de/sr/