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

Re: [PATCH 0/2] add support for per branch merge policy

From
LHLars Hjemli <hjemli@gmail.com>
Date
Sep 20, 2007, 13:38 UTC
Message-ID
<8c5c35580709200638v75fcf611m7c6465d074c9244d@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.64.0709201424270.28395@racer.site>
[...joining two posts in one...]
On 9/20/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 8 quoted lines
> > On 9/20/07, Lars Hjemli <hjemli@gmail.com> wrote:
> > > branch.<name>.integrationonly
> >
> > Btw: we might want to call this 'branch.<name>.mergepolicy' with the
> > possible values 'synchronize' and 'integrate'.
>
> IMHO this is way too limiting.
> Why not have something like branch.<name>.mergeOptions instead?
Yeah, that would be more powerful, I'll give it a try.

-- larsh

Previous: Johannes Schindelin
Message 8 of 8 in “add support for per branch merge policy”
  1. 0/2 add support for per branch merge policyLars Hjemli, Sep 20, 2007
  2. 1/2 git-merge: add option --no-ffLars Hjemli, Sep 20, 2007
  3. 2/2 add support for branch.<name>.integrationonlyLars Hjemli, Sep 20, 2007
  4. Johannes SchindelinSep 20, 2007
  5. Matthieu MoySep 20, 2007
  6. Lars HjemliSep 20, 2007
  7. Johannes SchindelinSep 20, 2007
  8. Lars HjemliSep 20, 2007

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.