From: Martin Waitz <tali@admingilde.org>
To: "Santi Béjar" <sbejar@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Per branch properties for pull and fetch
Date: Thu, 27 Jul 2006 10:55:16 +0200 [thread overview]
Message-ID: <20060727085516.GC27593@admingilde.org> (raw)
In-Reply-To: <87lkqfcvm2.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
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.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-07-27 8:55 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 [this message]
2006-07-27 9:40 ` Santi
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=20060727085516.GC27593@admingilde.org \
--to=tali@admingilde.org \
--cc=git@vger.kernel.org \
--cc=sbejar@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.