On Thu, Apr 3, 2008 at 11:45 PM, James Kingston <james.kingston@xxxxxxxxx> wrote: [...] > > /c> cd /c/cc > /c/cc> git init > /c/cc> git add * > /c/cc> git commit > /c/cc> mkdir /c/wd > /c/cc> cd /c/wd > /c/wd> git clone /c/cc > /c/wd> cd cc/ > /c/wd/cc> ls > /c/wd/cc> vi config.ini > /c/wd/cc> git checkout -b config_changes > /c/wd/cc> git diff > /c/wd/cc> git add config.ini > /c/wd/cc> git commit > /c/wd/cc> git checkout master > /c/wd/cc> git merge config_changes > /c/wd/cc> vi config.ini > /c/wd/cc> git push /c/cc git push updates the branches, not the working copy, so: cd /c/cc git pull /c/wd/cc HEAD > /c/wd/cc> cd /c/cc > /c/cc> vi config.ini # doesn't show the change made in experimental > branch, though gitk shows the patch > /c/cc> git status # says that config.ini has been modified > /c/cc> git add config.ini # grasping as straws > /c/cc> git commit # changes nothing, as far as I can tell > /c/cc> git reset --hard #still changes nothing. My diffs are there > in the log, just out of reach > Santi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
