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

Merging using only fast-forward

From
Sverre Hvammen Johansen <hvammen@gmail.com>
Date
Jan 16, 2008, 15:54 UTC
Message-ID
<loom.20080116T151930-575@post.gmane.org>
Hi,

I have a work flow where A is only allowed to rebase and B is only allowed to fast-forward. They both fetch from each other and rebase/merge using pull. On A I can use the configuration branch.<name>.rebase but it does not seem to be an option to enforce a fast-forward on B.

If there are changes on both A and B that have not yet been integrated (by A doing a pull (fetch/rebase)) I want a pull (fetch/merge) on B to fail.

It would be useful with a configuration ala branch.<name>.fast-forward or an option --ff-only to git-merge so I could use the configuration branch.<name>.mergeoptions.

Is there any other way to achieve this?

Thanks for a great tool. I am using git with accurev where B is the integrator between git and accurev (commits flow in both directions). I imagine this could be useful in other environments as well.

-- 
Sverre Hvammen Johansen
Next: Randal L. Schwartz
Message 1 of 15 in “Merging using only fast-forward”
  1. Sverre Hvammen JohansenJan 16, 2008
  2. Randal L. SchwartzJan 16, 2008
  3. Junio C HamanoJan 16, 2008
  4. Sverre Hvammen JohansenJan 16, 2008
  5. Junio C HamanoJan 16, 2008
  6. Sverre Hvammen JohansenJan 17, 2008
  7. Sverre Hvammen JohansenJan 18, 2008
  8. Junio C HamanoJan 18, 2008
  9. Sverre Hvammen JohansenJan 19, 2008
  10. Sverre Hvammen JohansenJan 19, 2008
  11. Junio C HamanoJan 19, 2008
  12. Sverre Hvammen JohansenJan 19, 2008
  13. Sverre Hvammen JohansenJan 21, 2008
  14. Sverre Hvammen JohansenJan 19, 2008
  15. Please don't reply to this threadSverre Hvammen Johansen, Jan 19, 2008

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.