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

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

From
Peter Krefting <peter@softwolves.pp.se>
Date
May 21, 2010, 17:49 UTC
Message-ID
<alpine.DEB.2.00.1005211848160.9961@perkele.intern.softwolves.pp.se>
In-Reply-To
<A612847CFE53224C91B23E3A5B48BAC74483234EDE@xmail3.se.axis.com>
Peter Kjellerstedt:
> Can you differentiate between an automatic merge which happened because 
> the user had made some local changes before pulling (which I do not want 
> to appear in the central repo), and a real merge of a topic branch (which 
> I do want)?

Sort of, by looking at the commit message. An auto-generated pull-merge will contain the branch name twice, once with the remote repository path, and once with the local repository path. You could walk the history that the user tries to push, looking for this kind of auto-generated merge messages.

This may of course teach your users to re-write the commit message into something more sensible, but that can only be a good thing :-)

-- 
\\// Peter - http://www.softwolves.pp.se/
Previous: Dmitry PotapovNext: Monsignor
Message 12 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.