On Friday 13 February 2009 7:27 pm, Markus Heidelberg wrote:
[...]
> I recommend rebase when having just one remote branch for updating the
> custom branch.
there are so many ways of using git i'd like to re-hash what
i've done so you can correct me or not -- i *think* i've got
it set up and happy
first i reverted my feature.h to its unmodified pristine
mainline form -- then
get checkout -b myfeatures
to create a local branch -- then i modified feature.h, then
git add src/feature.h
so git knows to track this module, then
git commit
so he knows that's the way i want it
in order to keep git happy i added checkouts to my update
script:
#!/bin/bash
set -e
cd ~/.build/vim/vim72/vim_extended
tail ~/.build/vim/update.log
dttm | tee -a ~/.build/vim/update.log
git checkout custom 2>&1 | tee -a ~/.build/vim/update.log
git pull 2>&1 | tee -a ~/.build/vim/update.log
git checkout myfeatures 2>&1 | tee -a ~/.build/vim/update.log
dsh 60 | tee -a ~/.build/vim/update.log
and by checking out to myfeatures last, the code flips back
to my modified state and i'm ready to build
it's cool the way the code on src changes when i use git to
checkout between custom and myfeatures -- i had fun with
that -- also i made use of git log, git branch, git status,
and git diff --cached as i was working through this
i am now very favorably impressed with git -- the words
people use when discussing it are starting to make sense to
me -- after seeing src/feature.h change by virtue of doing
those checkouts i became an instant fan
and before i forget, i got help from a friendly expert on
irc: freenode has a #git channel and my newbieness was
tolerated extremely well -- say hi to jast if you go there
so -- do you see something less than optimal here?
tia,
sc
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
