This is an old revision of the document!

Git

Branches and Merging

git checkout -b development or whatever your branch name is
make your changes in development branch
git add .
git commit -m “developed feature x”
git push origin development
when ready to merge, still on dev branch
git merge master should be clean, but gives you an opportunity to fix it
git checkout master should be clean again since we did above fix
git merge development --no-ff
git push

Multi line commit

git commit -m "Line one" -m "line two" -m "etc"

push to repo other than origin

git push --no-verify --mirror git@github.com:isuwebcom/Work

Change Origin

# useful for when repo is set to use https
git remote set-url origin git@github.com:kalenpw/repo.git