From: Jakub Narebski <jnareb@gmail.com>
To: Nicolas Pitre <nico@cam.org>
Cc: git@vger.kernel.org
Subject: Re: branch.<name>.merge specifying remote branch name
Date: Sat, 23 Dec 2006 15:32:39 +0100 [thread overview]
Message-ID: <200612231532.39363.jnareb@gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0612230924110.18171@xanadu.home>
Nicolas Pitre wrote:
> On Sat, 23 Dec 2006, Jakub Narebski wrote:
>
>> About the discussion about branch.<name>.merge specifying remote branch name
>> and relative merits of specifying remote branch name (without need for
>> tracking branch), and local branch name (which is supposedly more user
>> friendly, and branch name specifies also remote usually)...
>>
>> Perhaps it is time to resurrect branch.<name>.mergeLocal (or localMerge)
>> idea, and both sides would be happy (well, at least when one would code
>> it ;-).
>
> Adding more and more options doesn't make it friendlier to use.
>
> Why couldn't both names (local and remote) be accepted by
> branch.blah.merge?
Junio just implemented that. Although it is a bit of magic (which can bite
when you have remote which is not '.', and which has branches with the same
names like some of your local branches, and vice versa). mergeLocal would
be unambiguous...
--
Jakub Narebski
Poland
prev parent reply other threads:[~2006-12-23 14:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-23 9:14 branch.<name>.merge specifying remote branch name Jakub Narebski
2006-12-23 14:26 ` Nicolas Pitre
2006-12-23 14:32 ` Jakub Narebski [this message]
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=200612231532.39363.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=nico@cam.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).