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

Re: [PATCH] Per branch properties for pull and fetch

From
SSanti <sbejar@gmail.com>
Date
Jul 27, 2006, 10:06 UTC
Message-ID
<8aa486160607270306s3f49a01cq91ef61e2c9f005e@mail.gmail.com>
In-Reply-To
<8aa486160607270240h412b0dcek1d57eeb2b254fb2e@mail.gmail.com>
2006/7/27, Santi <sbejar@gmail.com>:
Show 23 quoted lines
> 2006/7/27, Martin Waitz <tali@admingilde.org>:
> > hoi :)
> >
> > On Thu, Jul 27, 2006 at 10:14:45AM +0200, Santi Béjar wrote:
> > > It allows to specify on a per branch basis the following:
> > > .- default repository to fetch
> > > .- default branches to merge on a per repository basis
> > > .- default pull.{octopus,twohead}
> > >
> > > So if you have this in the config:
> > > [branch "my"]
> > >       remote=yours
> > >       merge=master
> > >       merge=our from theirs
> > >       merge=mine from .
> >
> > could we default the to-be-merged branch to "remotes/$remote/$branch" if
> > that exists?. That could make life a lot easier when using
> > clone --use-separate-remote.
>
> I would prefer to change git-clone and git-branch to write the full
> config. And I'll do this if this or someting like this is accepted.
>

On the other hand, my patch changes the behaviour only when explicitly configured, and your proposed default would change the behaviour even without changes to the config.

Santi
Previous: SantiNext: Martin Waitz
Message 4 of 7 in “Per branch properties for pull and fetch”
  1. Per branch properties for pull and fetchSanti Béjar, Jul 27, 2006
  2. Martin WaitzJul 27, 2006
  3. SantiJul 27, 2006
  4. SantiJul 27, 2006
  5. Martin WaitzJul 27, 2006
  6. SantiJul 27, 2006
  7. Matthias LederhoferJul 27, 2006

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.