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

Re: Merging using only fast-forward

From
Randal L. Schwartz <merlyn@stonehenge.com>
Date
Jan 16, 2008, 16:27 UTC
Message-ID
<863asxivlj.fsf@blue.stonehenge.com>
In-Reply-To
<loom.20080116T151930-575@post.gmane.org>
>>>>> "Sverre" == Sverre Hvammen Johansen <hvammen@gmail.com> writes:

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

Junio implemented a 7-line patch on the IRC channel (calling parts of it "for randal" or something, I believe :) to do precisely this.

Perhaps you can test it, and submit it as if it were your idea. I, for one, would use it as well. I'm doing ugly things with parsing the output of git-status right now to achieve the same thing.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
Previous: Sverre Hvammen JohansenNext: Junio C Hamano
Message 2 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.