_sc_, 15.02.2009: > > On Saturday 14 February 2009 8:53 am, Markus Heidelberg wrote: > > > and by checking out to myfeatures last, the code flips back > > > to my modified state and i'm ready to build > > > > But you only updated 'custom', your 'myfeatures' branch didn't get the > > updates. You say it yourself: "the code flips back" or do I > > misunderstand you? > > no, it really flips back -- i had thought that since feature.h > was the only one i "added" it would be the only one flipping
Ah ok, no git doesn't change the content of your branches behind your back :) > i whacked everything down to the vim72 path and started over > with the clone If you don't muck around in .git/, there should be no reason to delete the whole repository and start from scratch. However, if you need a second working tree, you can do this: git clone --reference vim_extended git://repo.or.cz/vim_extended.git vim_extended_2 With this, the objects don't have to be downloaded from the server, since you already have them on your disk. Note that this sets up .git/objects/info/alternates to use the objects from your existing vim_extended clone. That means, if you move/rename vim_extended, you have to adjust the alternates file. > > And the relevant parts of what the update script should look like: > > > > git fetch > > git merge origin/feat/rel-line-numbers > > git merge origin/vim-with-runtime > > we were pulling, now we're fetching -- i really need to > spend some quality time with the git docs This is always a good idea, a good start is probably gittutorial. Basically pull = fetch + merge. Fetch doesn't touch your branches or working tree, merely downloads the objects and updates the remote branches. > i know it's not necessary, but i feel safer with a checkout > to custom in front of the fetch -- his 'already there' > message is not an error, and gives me a warm fuzzy that > git's pointing where i want him to before i start That's sensible of course. > ~/.build/vim/experimental/vim_extended $ git checkout custom > fatal: you need to resolve your current index first Remember git-mergetool from the README? > this is fun -- i can thumb my nose at my unresolved index > and hit the whack button The git-like whack button for this case is: git reset --hard > i really appreciate all your hand-holding on this, markus, > and i apologize for being so dense at times No problem, Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
