On Wednesday 11 February 2009 4:00 am, Markus Heidelberg wrote:
>
[...]
> > >
> > > 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 :)
my bad -- i'm behind the curve on linux distros -- my suse
10.2 is several iterations behind current, but it works -- i
tried upgrading to 10.3 not long after it came out, and
suddenly found myself in conflict hell -- the upgrade timed
out and gave up before resolving them all -- i decided to
wait til there was a compelling reason to upgrade -- i don't
think this is it, although it does sound a death knell for
10.2...
my plan is to buy a new harddrive when the time comes,
install 11.1 or so as dual boot to skip the conflicts, then
copy stuff from one to the other
> > [..]
>
> You can do
>
> git config --global branch.autosetupmerge true
>
> to globally enable it in you ~/.gitconfig instead of only for this
> repository.
ahhh -- an easy solution -- thank you thank you thank you
> 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.
is there any reason to believe my current setup isn't wholly
fixed? i've now got both
[branch "custom"]
remote = origin
merge = refs/heads/vim-with-runtime
in my .git/config for the vim project, and
[branch]
autosetupmerge = true
in my ~/.gitconfig -- my 'git pull's are politely claiming
"Already up-to-date.", my builds are building, the relnum
patch is working gorgeously, birds are singing, and my
country finally elected the same guy i voted for
> Maybe I'll add something like this to the README, but I didn't think
> such old git versions are still around.
if there's a way to mess things up you can generally count
on me to find it
anyway i'm definitely +1 for the README addition
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
