Re: What's in git.git (stable)

[merlyn@stonehenge.com (Randal L. Schwartz)]

>>>>> "Johannes" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> Ahh, it's "git-pull . origin".

Johannes> This is just a merge, not a real pull (it leaves out the fetch part).

OK, so what does what a naked "git-pull" used to do before, which was
"fetch origin, then pull it into the current branch"?

Johannes> So, for each branch (e.g. "xyz") for which you have a preferred upstream 
Johannes> (e.g. remote "linus" with branch "master"), say

Johannes> 	$ git repo-config branch.xyz.remote linus
Johannes> 	$ git repo-config branch.xyz.merge refs/heads/master

But that's not upward compatible.  The default should be the old behavior,
or we need a better way to notify people that this breaks things.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!