count_commits

git rev-list HEAD --count

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>