joelremix · May 27, 2014 15:37
diff --git a/git_basic_commands.txt b/git_basic_commands.txt

 //push branch to origin
 git push -u origin mynewfeature

 //create and checkout branch named hotfix
 git checkout -b hotfix

 //merge
 git checkout master
 git merge hotfix

	//push branch to origin
	git push -u origin mynewfeature

	//create and checkout branch named hotfix
	git checkout -b hotfix

	//merge
	git checkout master
	git merge hotfix