Package: git-core Version: 1:1.4.4.1-1 I just merged 2.6.20-rc1 into the 2.6.19 parisc tree as follows:
git-pull origin refs/tags/v$VERS (some conflicts were created, so I edited the files to remove the conflicts) git-commit -a Now git-status shows me a lot of untracked files, eg: # include/asm-arm/arch-at91rm9200/at91rm9200_twi.h According to commit a5c474580b8b7cc8b7b2cca9a2bd27ff5c065e70 these are renamed to omit the "rm9200" part of the name. I believe the git-commit should have deleted these files; it did correctly notice it was in the middle of a merge. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
