I’m working on a localhost to live wordpress workflow using git (based on Mark Jaquith’s WordPress Local Dev post). My file structure looks like this
local.dev
- .git
- index.php
- .htaccess
- wp-config.php
- local-config.php (ignored)
- content/themes/
- content/plugins/
- content/uploads/ (ignored)
- core/ (wordpress core)
What I want to do is to grab the latest wordpress from github and put it in core/ so that the upgrade process would look like
rm -rf wordpress
svn export http:// core.svn.wordpress.org/trunk/ wordpress
git add --all wordpress
git commit -m 'Upgrade WordPress' wordpress
git push origin master
BUT I’m having a hell of a time figuring out how to put WordPress in its own directory without
- using svn
- using git pull into local.dev and moving the files into core/ manually.
What am I missing?
Thanks
It sounds like you want to use a subtree merge: http://git-scm.com/book/ch6-7.html