On 12/6/06, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> I almost felt the branch.<name>.merge was for that.
No. This tells git which _default_ branch to merge with. I.e.
$ git repo-config branch.master.remote origin
$ git repo-config branch.master.merge next
means that if your current branch is "master", a "git pull" _without_
parameters will default to the branch "next" of the remote "origin" you
just set up like above.
This doesn't work. So this is what i tried
test repository with master and devel branch
cloned it to test.devel
.git/config have
[branch "devel"]
remote = origin
merge = devel
Now IIUC this should be when i am in branch devel when i do a git pull
pull from origin remote and merge with the local branch devel the
remote branch devel.
But git pull says already up to date.
Now i thought merge should be local reference. So i changed it to
merge = remotes/origin/devel.
That also didn't work.
Then i tried the name of the branch should be indicated as
"refs/heads/devel" . That also didn't work.
So i guess i am missing something.
-aneesh
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html