From: Santi <sbejar@gmail.com>
To: "Martin Waitz" <tali@admingilde.org>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH] Per branch properties for pull and fetch
Date: Thu, 27 Jul 2006 11:40:37 +0200 [thread overview]
Message-ID: <8aa486160607270240h412b0dcek1d57eeb2b254fb2e@mail.gmail.com> (raw)
In-Reply-To: <20060727085516.GC27593@admingilde.org>
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.
Santi
next prev parent reply other threads:[~2006-07-27 9:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-27 8:14 [PATCH] Per branch properties for pull and fetch Santi Béjar
2006-07-27 8:55 ` Martin Waitz
2006-07-27 9:40 ` Santi [this message]
2006-07-27 10:06 ` Santi
2006-07-27 12:02 ` Martin Waitz
2006-07-27 13:10 ` Santi
2006-07-27 20:26 ` Matthias Lederhofer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8aa486160607270240h412b0dcek1d57eeb2b254fb2e@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=tali@admingilde.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).