merge_agalma_conda_recipes.sh

# clone repo I want subtree from
git clone [email protected]:caseywdunn/agalma.git
cd agalma
# be paranoid and remove origin so I don't push back to origin
git remote rm origin
# filter subtree I want
git filter-branch --prune-empty --subdirectory-filter dev/conda master
# move subtree to match destination directory structure, maintaining history
git filter-branch -f --index-filter 'git ls-files -s | sed "s-\t\"*-&recipes/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
# clean up
git rm -r recipes/agalma
git commit -m "remove the agalma recipe"
cd ..
# clone destination repo
git clone [email protected]:caseywdunn/conda-recipes.git
cd conda-recipes
# add my subtree as a remote
git remote add agalma ../agalma
git fetch --all
# merge 
git merge --allow-unrelated-histories agalma/master -m "merging agalma recipes into new recipe repo"
# clean and push
git remote rm agalma
git push