Merge function for git_tools

@evansde77 

This was more straight forward than I thought. I went ahead and manually did this on my test repo to convince myself it was and it works as expected.