{"thread":{"id":"20215","subject":"Fast-forward-only merge","startedAt":"2009-07-24T09:50:47Z","lastAt":"2009-07-24T10:40:00Z","messageCount":2,"participants":["Florian Weimer","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"118623","messageId":"82ws5y4dfs.fsf@mid.bfk.de","threadId":"20215","inReplyTo":null,"subject":"Fast-forward-only merge","fromName":"Florian Weimer","fromEmail":"fweimer@bfk.de","sentAt":"2009-07-24T09:50:47Z","receivedAt":"2009-07-24T09:50:47Z","isPatch":false,"sender":{"key":"fweimer@bfk.de","avatar":null},"body":"Is there an easy way to require that \"git merge\" succeeds only if the\nmerge is fast-forward?\n\n-- \nFlorian Weimer                <fweimer@bfk.de>\nBFK edv-consulting GmbH       http://www.bfk.de/\nKriegsstraße 100              tel: +49-721-96201-1\nD-76133 Karlsruhe             fax: +49-721-96201-99\n"},{"id":"118626","messageId":"4A698F80.2020801@drmicha.warpmail.net","threadId":"20215","inReplyTo":"82ws5y4dfs.fsf@mid.bfk.de","subject":"Re: Fast-forward-only merge","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-07-24T10:40:00Z","receivedAt":"2009-07-24T10:40:00Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Florian Weimer venit, vidit, dixit 24.07.2009 11:50:\n> Is there an easy way to require that \"git merge\" succeeds only if the\n> merge is fast-forward?\n> \n\nThere's an easy way to test before the merge (git merge-base), but an\noption for git merge is still missing:\n\nhttp://article.gmane.org/gmane.comp.version-control.git/76787\nhttp://article.gmane.org/gmane.comp.version-control.git/80284\nhttp://article.gmane.org/gmane.comp.version-control.git/107768\nhttp://article.gmane.org/gmane.comp.version-control.git/118529\n\nCheers,\nMichael\n"}]}