Brian May <bam@debian.org> writes: > git read-tree --reset -u upstream > git reset -- debian > git checkout debian > git rm debian/.git-dpm git commit Of course... -- Brian May <bam@debian.org>