Git references

Simple Git Guide

Create a new branch named "feature_x" and switch to it using
git checkout -b feature_x

Switch back to master
git checkout master

Delete the branch when done
git branch -d feature_x

Branch is not available to others unless you push the branch to your remote repository
git push origin <branch>

Merge from a branch to active branch
git merge <branch>

Do this on each library

git checkout release/2.3
git pull
git checkout -b LA_mah

To pull commited submits from master (or other branch) to new branch

git checkout -b LA_mah
git merge master
git checkout master
git reset --hard 508959bf0777a1d390976d3c282ca698993d2ad7

To merge from one branch to another, this merges changes from LA_mah to source_qual_brh

git checkout -b source_qual_brh
git merge LA_mah
git push

Moving to bitbucket

git status
git remote -v
git remote add bitbucket git@bitbucket.org:heuresistechsoftware/hbi.git
git remote rm origin
git remote -v
git remote --help
git remote rename bitbucket origin
git remote -v
git log -2
git pull
git branch --set-upstream-to=origin/LA_mah LA_mah
git pull

Rebase

git pull
# status must show up to date, nothing to commit
git status
git rebase release/2.3
git pull
git push