paperdigits · January 2, 2016 23:39
diff --git a/count_commits b/count_commits
 git rev-list HEAD --count
diff --git a/git_merge_branch_into_master.txt b/git_merge_branch_into_master.txt
 #This snipped is to merge a  branch into the  master branch of a Git repository. To make the commit histories nice, we will use git rebase, then merge...

 #check out the branh you want to merge into master.
 git checkout <branch name>

 #use rebase to merge histories
 git rebase master

 #RESOLVE REPOSITORY CONFICTS HERE!

 #change back to master
 git checkout master

 #merge the two together
 git merge <branch name>
	#This snipped is to merge a branch into the master branch of a Git repository. To make the commit histories nice, we will use git rebase, then merge...

	#check out the branh you want to merge into master.
	git checkout <branch name>

	#use rebase to merge histories
	git rebase master

	#RESOLVE REPOSITORY CONFICTS HERE!

	#change back to master
	git checkout master

	#merge the two together
	git merge <branch name>