git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
SRStefan Richter <stefanr@s5r6.in-berlin.de>
Date
Jun 21, 2008, 14:08 UTC
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/
Next: Graham Wilson
Message 1 of 4 in “"git-pull --no-commit" should imply --no-ff...?”
  1. Stefan RichterJun 21, 2008
  2. Graham WilsonJun 22, 2008
  3. Miklos VajnaJun 22, 2008
  4. Stefan RichterJun 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.