Re: "git-pull --no-commit" should imply --no-ff...?

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jun 22, 2008, 13:49 UTC
Message-ID: <20080622134946.GL29404@genesis.frugalware.org>
In-Reply-To: <20080622133606.GA21828@endor.mknod.org>

On Sun, Jun 22, 2008 at 08:36:06AM -0500, Graham Wilson <graham@mknod.org> wrote:

Show 10 quoted lines

> 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

Or git merge --no-commit --squash?