Merge and pull fix

g.merge can now pass along extra arguments - In my case, --squash

g.pull should not merge the current branch into the current branch - fixed to point merge in what is specified in remote. (so merge origin master as a normal git pull would do works as you would expect)