git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Explicitly add the default "git pull" behaviour to .git/config on clone
Date: Fri, 08 Dec 2006 11:36:36 +0100	[thread overview]
Message-ID: <elbf3l$bm7$1@sea.gmane.org> (raw)
In-Reply-To: 200612071544.03306.Josef.Weidendorfer@gmx.de

Josef Weidendorfer wrote:

> However, as discussed in another thread, branch.*.merge currently has quite
> a strange semantic [*1*], and without changing, users have no way to grasp this
> configuration option.
[...]
> [*1*] Currently, in branch.*.merge you have to specify the remote branch name
> of a refspec which updates a local tracking branch in the fetch phase of git pull.
> I.e. the option value has nothing todo with the merge action itself!

That's (I think) because branch.<name>.merge can be for pull used _without_
tracking branch. So it is not that easy to change semantics, I agree bit
strange for newbie git users, who know git from the begining with
--use-separate-remote and tracking branches.

Perhaps we should extend it so it can take beginning part of refspec
(as now), full refspec, or ':' and local branch.
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git


  reply	other threads:[~2006-12-08 10:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-06 12:07 [PATCH] Explicitly add the default "git pull" behaviour to .git/config on clone Andy Parkins
2006-12-06 12:20 ` Johannes Schindelin
2006-12-06 12:27 ` Jakub Narebski
2006-12-06 12:55   ` Andy Parkins
2006-12-06 12:36 ` Peter Baumann
2006-12-06 17:00 ` Josef Weidendorfer
2006-12-06 17:15   ` Jakub Narebski
2006-12-06 23:23   ` Johannes Schindelin
2006-12-07  2:49     ` Josef Weidendorfer
2006-12-07  3:44       ` Junio C Hamano
2006-12-07 14:52         ` Josef Weidendorfer
2006-12-07 14:13       ` Johannes Schindelin
2006-12-07 14:44         ` Josef Weidendorfer
2006-12-08 10:36           ` Jakub Narebski [this message]
2006-12-07  6:49 ` Aneesh Kumar K.V

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='elbf3l$bm7$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.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).