From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: confusion over the new branch and merge config
Date: Fri, 22 Dec 2006 22:04:57 +0100 [thread overview]
Message-ID: <emhh4k$u4q$1@sea.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.64.0612221539100.18171@xanadu.home
<opublikowany i wysłany>
Nicolas Pitre wrote:
> On Thu, 21 Dec 2006, Junio C Hamano wrote:
>> No, the message says "any REMOTE branch" -- refs/heads/next is
>> what it is called at the remote, and that is how the value is
>> expected to be spelled; I think somebody added an example to
>> config.txt recently to stress this. The above error messasge
>> obviously was not clear enough. Rewording appreciated.
>
> But wouldn't it be much less confusing if it used the local name for
> that remote branch instead? After all it is what should be used with
> git-merge if performed manually, it is what diff, log, and al must use
> as well. Why would this need a remote name for something that is a
> local operation after all? I think "refs/heads/master" is really
> ambigous since you might be confused between the local and remote
> meaning of it, whereas "origin/master" carries no confusion at all.
Perhaps less confusing, but also less powerfull. Current notation
allows for pulling _without need for tracking branches_.
Although I wonder if it is possible to have multiple branch.<name>.remote,
and branch.<name>.merge always refering to latest remote (octopus if there
are more than one branch.<name>.merge for remote)...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-22 21:02 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 [this message]
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
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='emhh4k$u4q$1@sea.gmane.org' \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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