Anil's CheatSheet for AS7 Development

    Objective: Set up Marcus's GIT master as a remote repository

     

    git remote add marcus https://github.com/mmoyses/jboss-as.git 
    

     

     

     

    Objective: Sync my branch with Marcus on a regular basis.

     

     git fetch marcus; git merge marcus/master --ff-only
    

     

     

    Objective:  Bungled my master.  Need to recreate my master from jboss-as upstream master.

     

     

    git branch -D master
    git fetch upstre am
    git checkout upstream/master 
    git checkout -b master
    

     

     

    Objective:  Cherry pick one of Marcus's commits

     

     

    git cherry-pick b4e04f52046cad2687d60348bad3c8678ccd2963
    

     

    b4e0   is the commit id