public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

* Fast-forward-only merge
@ 2009-07-24  9:50 Florian Weimer
  2009-07-24 10:40 ` Michael J Gruber
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2009-07-24  9:50 UTC (permalink / raw)
  To: git

Is there an easy way to require that "git merge" succeeds only if the
merge is fast-forward?

-- 
Florian Weimer                <fweimer@bfk•de>
BFK edv-consulting GmbH       http://www.bfk.de/
Kriegsstraße 100              tel: +49-721-96201-1
D-76133 Karlsruhe             fax: +49-721-96201-99

^ permalink raw reply	[flat|nested] 2+ messages in thread

• * Re: Fast-forward-only merge
    2009-07-24  9:50 Fast-forward-only merge Florian Weimer
  @ 2009-07-24 10:40 ` Michael J Gruber
    0 siblings, 0 replies; 2+ messages in thread
  From: Michael J Gruber @ 2009-07-24 10:40 UTC (permalink / raw)
    To: Florian Weimer; +Cc: git
  
  Florian Weimer venit, vidit, dixit 24.07.2009 11:50:
  > Is there an easy way to require that "git merge" succeeds only if the
  > merge is fast-forward?
  > 
  
  There's an easy way to test before the merge (git merge-base), but an
  option for git merge is still missing:
  
  http://article.gmane.org/gmane.comp.version-control.git/76787
  http://article.gmane.org/gmane.comp.version-control.git/80284
  http://article.gmane.org/gmane.comp.version-control.git/107768
  http://article.gmane.org/gmane.comp.version-control.git/118529
  
  Cheers,
  Michael
  
  ^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-07-24 10:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-24  9:50 Fast-forward-only merge Florian Weimer
2009-07-24 10:40 ` Michael J Gruber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox