_sc_, 11.02.2009:
>
> On Tuesday 10 February 2009 5:54 pm, Markus Heidelberg wrote:
> >
> > _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.
>
> my git reports it is version 1.5.2.4 -- is that old? i
It's 1,5 years old, the default mentioned above has changed in 1.5.3
Close aside :)
> > If this is the case, either set branch.autosetupmerge to true or update
> > git, which is of course recommended.
>
> please tell me if i need to take steps to get a newer git
>
> following is my entire .git/config:
>
> [..]
>
> is somewhere in here where i should add something about
> branch.autosetupmerge? somewhere else? (this config is on
> my ~/.build/vim/vim72/vim_extended/.git path)
You can do
git config --global branch.autosetupmerge true
to globally enable it in you ~/.gitconfig instead of only for this
repository.
Or you can simply add it by hand:
[branch]
autosetupmerge = true
Of course this is for future creation of custom branches only, it
doesn't affect or improve your current setup.
Maybe I'll add something like this to the README, but I didn't think
such old git versions are still around.
> and i should again mention, before we go too far in assuming
> there's a problem in my setup, i think i may well have
> bolixed the setup myself: i don't remember exactly when in
> the process it was, but it may well have been during the
> checkout of vim-with-runtime, i remember being surprised
> with the fact that i wasn't in a totally normal shell -- i
> had been using midnight commander and had shelled out of it
> with Ctrl-O and was working in that shell -- i suspect it
> has differences much as has been discussed in a different
> thread concerning shelling out from vim -- i noticed it i
> think because something wasn't working like it was supposed
> to -- i think my 'inst' script was executing from my ~/bin
> path (long irrelevant story)
Don't worry, that didn't hurt.
Markus
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
