Re: git pull and merging.

From: Josef Weidendorfer <josef.weidendorfer@gmx.de>
Date: Dec 7, 2006, 22:54 UTC
Message-ID: <200612072354.01830.Josef.Weidendorfer@gmx.de>
In-Reply-To: <7vhcw7ttj9.fsf@assigned-by-dhcp.cox.net>

On Thursday 07 December 2006 20:06, you wrote:

Show 10 quoted lines

> Once you place something like "branch.*.merge" in configuration
> file (either $GIT_DIR/config, or a $GIT_DIR/remotes/* file), you
> are talking about other repositories you regularly interact
> with, so it might be probably Ok to require the user to use a
> tracking branch if he wants the convenience of "branch.*.merge",
> and make its value name the local tracking branch instead of the
> remote branch.
> 
> But that means I would never be able to benefit from the
> convenience of "branch.*.merge";

Hmm... that's true; actually, I did not thought about people which do not want to have any tracking branches (again!). So

[remote "repo"]
  url = ...
  fetch = branch1
  fetch = branch2

[branch "mybranch1"]
  remote = repo
  merge = branch1

actually looks fine, and is the only possible way. But still, this does not work. You have to specify

  merge = refs/heads/branch1

That's confusing (perhaps I can come up with a patch to allow "branch1" alone).

So probably the best way is to write some more detailed explanation into the docu ...