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

[PATCH] Fast forward strategies allow, never, and only

From
Sverre Hvammen Johansen <hvammen@gmail.com>
Date
Apr 20, 2008, 01:06 UTC
Message-ID
<402c10cd0804191806h5460eb82y2442517343734b8e@mail.gmail.com>
In-Reply-To
<402c10cd0803302119r251b3a43te69ce2a52e121ba5@mail.gmail.com>

On Sun, Mar 30, 2008 at 9:19 PM, Sverre Hvammen Johansen <hvammen@gmail.com> wrote:

Show 12 quoted lines
> I have attached a new set of patches to this email (to avoid
>
> line-wrapping issues if someone needs them for testing).  They are
>  also posted inlined for comments.
>
>  The patch series consists of the following five patches:
>
>    0001-New-merge-tests.patch
>    0002-Introduce-ff-fast-forward-option.patch
>    0003-Restructure-git-merge.sh.patch
>    0004-Head-reduction-before-selecting-merge-strategy.patch
>    0005-Introduce-fast-forward-option-only.patch

I consider myself finished with this and as far as I am concerned it can be applied to git.git. I am currently using this on top of 1.5.5 in production and assume it to be good. All tests passes.

-- 
Sverre Hvammen Johansen
Previous: Sverre Hvammen JohansenNext: Junio C Hamano
Message 25 of 27 in “Fast forward strategies allow, never, and only”
  1. Fast forward strategies allow, never, and onlySverre Hvammen Johansen, Mar 11, 2008
  2. Sverre Hvammen JohansenMar 11, 2008
  3. Ping YinMar 11, 2008
  4. Junio C HamanoMar 11, 2008
  5. Sverre Hvammen JohansenMar 12, 2008
  6. Sverre Hvammen JohansenMar 16, 2008
  7. Sverre Hvammen JohansenMar 14, 2008
  8. Jakub NarebskiMar 11, 2008
  9. Sverre Hvammen JohansenMar 12, 2008
  10. Junio C HamanoMar 12, 2008
  11. Sverre Hvammen JohansenMar 12, 2008
  12. Sverre Hvammen JohansenMar 18, 2008
  13. Ping YinMar 18, 2008
  14. Sverre Hvammen JohansenMar 18, 2008
  15. Jon LoeligerMar 18, 2008
  16. Jakub NarebskiMar 18, 2008
  17. Sverre Hvammen JohansenMar 19, 2008
  18. Jakub NarebskiMar 19, 2008
  19. Sverre Hvammen JohansenMar 20, 2008
  20. Junio C HamanoMar 19, 2008
  21. Sverre Hvammen JohansenMar 20, 2008
  22. Junio C HamanoMar 22, 2008
  23. Sverre Hvammen JohansenMar 26, 2008
  24. Sverre Hvammen JohansenMar 31, 2008
  25. Fast forward strategies allow, never, and onlySverre Hvammen Johansen, Apr 20, 2008
  26. Junio C HamanoApr 22, 2008
  27. Sverre Hvammen JohansenApr 24, 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.