HOW-TO:Create add-on PRs using Git Subtree Merging

Example git setup using Subtree merging

git clone [email protected]:xbmc/repo-plugins.git

git remote add myaddon [email protected]:me/myaddon.git
git fetch myaddon

git checkout -b myaddon_branch myaddon/master
git checkout gotham

First time setup if your addon already exist in repo:
git rm -r plugin.my.addon/

git read-tree --prefix=plugin.my.addon/ -u myaddon_branch
git diff --staged
git commit -m "[plugin.my.addon] 1.0.1"

Updates

git checkout gotham
git pull --strategy subtree --squash myaddon v1.0.2
git commit -m "[plugin.my.addon] 1.0.2"
git push origin gotham