_sc_, 07.02.2009:
> 
> On Friday 06 February 2009 4:09 pm, Matt Wozniski wrote:
> > 
> > > and my .git/config contains:
> > 
> > Somehow, you're missing this:
> > 
> > [branch "custom"]
> >     remote = origin
> >     merge = refs/heads/vim-with-runtime
> > 
> > and adding that in should make things work just fine...
> 
> indeed it does
> 
> 06 Feb 2009  16:52  Fri
> Already up-to-date.
> 
> thank you a lot Matt, that made all the difference
> 
> markus:  i don't know what i did different than matt --

Maybe you have an old git version installed, where the automatic setup
of .git/config for the remote tracking branches (during the command "git
checkout -b custom origin/vim-with-runtime") was not yet the default.

If this is the case, either set branch.autosetupmerge to true or update
git, which is of course recommended.

Markus


--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---

Raspunde prin e-mail lui