reset distgit tree rather than trying to merge

git pull is equiv to fetch + merge.
Fetch is redundant as done already.
Merge is problematic with rebased repos.
So simply reset to the appropriate origin/$branch
Merge pull request #3 from pixelb/distgit-update

reset distgit tree rather than trying to merge