git-p4: allow unshelving of branched files