Added ability to pass options to checkout
Add a merge option for to show all files in a git merge