From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 21 Jun 2008 14:08:51 GMT
Subject: "git-pull --no-commit" should imply --no-ff...?
Message-ID: <tkrat.5aa5af8e9968819c@s5r6.in-berlin.de>

Hi list,

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.

I then learned that "git pull --no-ff --no-commit . foo" does what I
wanted.  What good does it do to ignore --no-commit in the fast-forward
case unless --no-ff is given?

This is with git 1.5.4.5.
-- 
Stefan Richter
-=====-==--- -==- =-=-=
http://arcgraph.de/sr/