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

Re: Master and origin/master diverged

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 22, 2012, 23:59 UTC
Message-ID
<7v1ul6nbju.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAE1pOi2MN_c76UBeRzdRbU8s+0LzYVoVcJ13V0di=HQobj+aDg@mail.gmail.com>
Hilco Wijbenga <hilco.wijbenga@gmail.com> writes:
Show 9 quoted lines
>> Some ways you can prevent it from happening again:
>> (1) setting your canonical repo config to deny non-ff, and deny deletes:
>> [receive]
>>        denyDeletes = true
>>        denyNonFastforwards = true
>
> I would *really* like to do that but I need access to the server for
> that, right? Unfortunately, we use Unfuddle and that means no such
> access. So no server config changes and no Git hooks.

receive.denyNonFastforwards is a reasonable thing to ask for projects with a shared repository workflow, so I suspect hosting service providers may want to race adding support for it to win customers. Have you asked them?

Previous: Neal KreitzingerNext: Hilco Wijbenga
Message 11 of 13 in “Master and origin/master diverged”
  1. Hilco WijbengaJun 22, 2012
  2. Phil HordJun 22, 2012
  3. Hilco WijbengaJun 22, 2012
  4. Phil HordJun 22, 2012
  5. Hilco WijbengaJun 22, 2012
  6. Neal KreitzingerJun 22, 2012
  7. Hilco WijbengaJun 22, 2012
  8. Neal KreitzingerJun 22, 2012
  9. Hilco WijbengaJun 26, 2012
  10. Neal KreitzingerJun 27, 2012
  11. Junio C HamanoJun 22, 2012
  12. Hilco WijbengaJun 26, 2012
  13. Junio C HamanoJun 26, 2012

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.