From: "Santi Béjar" <sbejar@gmail.com>
To: "Jakub Narebski" <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: confusion over the new branch and merge config
Date: Wed, 3 Jan 2007 01:24:33 +0100 [thread overview]
Message-ID: <8aa486160701021624v69015fbibb81a99177dd7dfc@mail.gmail.com> (raw)
In-Reply-To: <enef73$467$1@sea.gmane.org>
On 1/2/07, Jakub Narebski <jnareb@gmail.com> wrote:
> Junio C Hamano wrote:
>
> > Obviously, the local names should matter more when you are doing
> > local operations. So if you are using mergeLocal to give a
> > shorthand to "git merge" that does not explicitly say what to
> > merge, the above discussion does not apply. But if that is the
> > case, mergeLocal should also not affect the selection of
> > branches to be merged when "git pull" happens from a remote
> > either.
>
> You can always use remote = ".", and then remote and local branches
> are the same...
Currently it does not work.
Santi
next prev parent reply other threads:[~2007-01-03 0:24 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-21 22:17 confusion over the new branch and merge config Nicolas Pitre
2006-12-21 23:01 ` Junio C Hamano
2006-12-21 23:21 ` Sean
2006-12-22 0:39 ` Junio C Hamano
2006-12-22 0:46 ` Junio C Hamano
2006-12-22 1:01 ` Sean
2006-12-22 8:31 ` Andy Parkins
2006-12-22 7:50 ` Alan Chandler
2006-12-22 8:21 ` Junio C Hamano
2006-12-22 8:39 ` Andy Parkins
2006-12-22 15:25 ` Alan Chandler
2006-12-22 20:49 ` Nicolas Pitre
2006-12-22 21:04 ` Jakub Narebski
2006-12-22 21:20 ` Nicolas Pitre
2006-12-22 22:40 ` Jakub Narebski
2006-12-22 23:39 ` Junio C Hamano
2006-12-23 3:10 ` Tom Prince
2006-12-23 5:11 ` Nicolas Pitre
2006-12-23 5:12 ` Jeff King
2006-12-23 5:29 ` Nicolas Pitre
2006-12-23 6:15 ` Junio C Hamano
2006-12-23 6:22 ` Shawn Pearce
2006-12-23 6:28 ` Jeff King
2006-12-23 7:11 ` Junio C Hamano
2006-12-23 7:25 ` Jeff King
2006-12-23 9:51 ` Junio C Hamano
2006-12-23 10:40 ` Jakub Narebski
2006-12-23 15:58 ` Johannes Schindelin
2006-12-23 22:48 ` Jakub Narebski
2006-12-24 6:15 ` Jeff King
2006-12-24 20:49 ` Nicolas Pitre
2006-12-26 7:33 ` Jeff King
2007-01-02 14:49 ` Jeff King
2007-01-02 17:32 ` Junio C Hamano
2007-01-02 17:34 ` Jeff King
2007-01-02 20:04 ` Junio C Hamano
2007-01-02 20:30 ` Jakub Narebski
2007-01-03 0:24 ` Santi Béjar [this message]
2007-01-03 23:02 ` Jakub Narebski
2007-01-09 15:05 ` Jeff King
2007-01-09 16:18 ` Jeff King
2006-12-23 8:31 ` Jakub Narebski
2006-12-22 8:41 ` Andy Parkins
2006-12-22 9:39 ` Lars Hjemli
2006-12-22 15:10 ` Nicolas Pitre
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=8aa486160701021624v69015fbibb81a99177dd7dfc@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@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 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).