Table of Contents

Git

Git

Branches and Merging

git checkout -b new-branch or whatever your branch name is
make your changes in development branch
git add .
git commit -m “developed feature x”
git push origin new-branch
when ready to merge, still on new-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 new-branch --no-ff
git push

Replace one branch with another

Useful if working on complete overhauls in a separate branch

git checkout better_branch
git merge --strategy=ours master 
git checkout master
git merge better_branch

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