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

Re: Use "git pull --ff-only" by default?

From
MMonsignor <3pzqma+9rz4ms8xqpvbw@sharklasers.com>
Date
Apr 29, 2016, 06:38 UTC
Message-ID
<1461911930694-7654696.post@n2.nabble.com>
In-Reply-To
<A612847CFE53224C91B23E3A5B48BAC74483234E90@xmail3.se.axis.com>

For people who still find this thread in Google, there is a way to do that now:

*git config --add pull.ff only*
>From the documentation:
pull.ff
    By default, Git does not create an extra merge commit when merging a
commit that is a descendant of the current commit. Instead, the tip of the
current branch is fast-forwarded. When set to false, this variable tells Git
to create an extra merge commit in such a case (equivalent to giving the
--no-ff option from the command line). When set to only, only such
fast-forward merges are allowed (equivalent to giving the --ff-only option
from the command line). This setting overrides merge.ff when pulling.

-- View this message in context: http://git.661346.n2.nabble.com/Use-git-pull-ff-only-by-default-tp5084103p7654696.html Sent from the git mailing list archive at Nabble.com.

Previous: Peter Krefting
Message 13 of 13 in “Use "git pull --ff-only" by default?”
  1. Peter KjellerstedtMay 21, 2010
  2. Ævar Arnfjörð BjarmasonMay 21, 2010
  3. Michael J GruberMay 21, 2010
  4. Peter KjellerstedtMay 21, 2010
  5. Michael J GruberMay 21, 2010
  6. Jay SoffianMay 21, 2010
  7. Michael J GruberMay 22, 2010
  8. Peter KjellerstedtMay 24, 2010
  9. Dmitry PotapovMay 24, 2010
  10. Peter KjellerstedtMay 25, 2010
  11. Dmitry PotapovMay 27, 2010
  12. Peter KreftingMay 21, 2010
  13. MonsignorApr 29, 2016

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.