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

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

From
Miklos Vajna <vmiklos@frugalware.org>
Date
May 12, 2008, 12:13 UTC
Message-ID
<20080512121354.GM27724@genesis.frugalware.org>
In-Reply-To
<402c10cd0805112217u2688eac6h8a650b7ab7bb4883@mail.gmail.com>
On Sun, May 11, 2008 at 10:17:26PM -0700, Sverre Hvammen Johansen <hvammen@gmail.com> wrote:
Show 16 quoted lines
> I am hereby sending an updated version of these patches as
> attachments to this mail.  The patch series consists of the
> following six patches:
> 
>   0001-Documentation-for-joining-more-than-two-histories.patch
>   0002-New-merge-tests.patch
>   0003-Introduce-ff-fast-forward-option.patch
>   0004-Restructure-git-merge.sh.patch
>   0005-Head-reduction-before-selecting-merge-strategy.patch
>   0006-Introduce-fast-forward-option-only.patch
> 
> The first patch add some documentation, for how git currently handles
> merges where more than one remote is involved.   The second patch add
> some tests.  The third, fifth, and sixth adds new features and they are all
> trivial.  The fourth patch computes the reduced parents but uses it only
> to determine whether we are up-to-date or doing a fast forward.

According to Documentation/SubmittingPatches, you should not attach patches, but send one email / patch with the patch inline.

Just use git-send-email to do so. :)
Previous: Sverre Hvammen Johansen
Message 2 of 2 in “Fast forward strategies allow, never, and only”
  1. Fast forward strategies allow, never, and onlySverre Hvammen Johansen, May 12, 2008
  2. Miklos VajnaMay 12, 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.