> > - Do a git pull > > I'm not enitirely sure you want post-update doing the pull. Really? Let's say the website lives in /srv/www/htdocs Let's also say the git repository lives in /srv/www/git All developers pull/push from /srv/www/git (git@server:/srv/www/git) The website is a clone of /srv/www/git and only tracks 'master'. Post-update (simplified) changes to /srv/www/htdocs and does 'git pull'. I'm referencing this article: http://jblevins.org/log/tools/managing-websites-with-git Would you recommend a different way to automatically push any changes to 'master' down to the website? > > > - Then create a new branch 'working' and checkout > > - Apply the patches to 'working' and commit > > > >This leaves 'working' == 'master^' > > Actually, it leaves HEAD == working and master == working^. I'm sorry - I mixed up my terminology. I am referring to the branch's log. 'working' has 1 more log entry than 'master'. Example: - git log master | grep ^commit | tail -n 2 | head -n 1 - git log working | grep ^commit | tail -n 1 | head -n 1 Both of these commands should return the same commit hash. -- 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
