Update git.md

Fixed git svn clone syntax.  Added command for merging trunk into a branch.  This preserves the tree in git.