jboss-developer/jboss-sandbox-quickstarts — pull request #2 by sgilda (2013-10-15 16:02:42+00:00)
Title: Ejb security to branch

@pmuir: I couldn't get the read-tree to work because it seems to be trying to add the remote to a subdirectory of the jboss-sandbox-quickstarts.

This is how I did the merge:

1. cd to my `jboss-eap-quickstarts` directory
2. git fetch upstream
3. git checkout -b save-ejb-security-quickstarts upstream/master
4. remove everything but the `ejb-security-plus` and `ejb-security-propagation` quickstarts and commit.
5. git push sgilda HEAD

6. cd to my `jboss-sandbox-quickstarts` directory
7. git remote add -f sgilda-eap-qs https://github.com/sgilda/jboss-as-quickstart.git
8. git checkout -b ejb-security-from-branch sgilda-eap-qs/save-ejb-security-quickstarts (branch with 2 quickstarts)
9. git fetch upstream
10. git checkout -b ejb-security-to-branch upstream/master
11. git merge ejb-security-from-branch
12. git push sgilda HEAD

Please verify, but it looks like this merge contains the history for all the merged files. For example, when I view the History for the following, it shows all the changes made to that file:

https://github.com/sgilda/jboss-sandbox-quickstarts/blob/ejb-security-to-branch/ejb-security-plus/README.md