{"thread":{"id":"43764","subject":"rebasing, git-am and whitespace cleanup conundrims","startedAt":"2006-10-25T22:49:36Z","lastAt":"2006-10-25T22:49:36Z","messageCount":1,"participants":["Martin Langhoff"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"298222","messageId":"46a038f90610251549u46af5ab9gefb56423fb663e96@mail.gmail.com","threadId":"43764","inReplyTo":null,"subject":"rebasing, git-am and whitespace cleanup conundrims","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-10-25T22:49:36Z","receivedAt":"2006-10-25T22:49:36Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Hola!\n\ni'm going through a rebase of a long series of patches (~50) that have\nquite a bit of trailing whitespace. Once the rebase is done on my repo\n(resolving all the code level conflicts), I want to re-rebase it on\ntop of the same commit but cleaning up trailing whitespace.\n\nThe problem is that upstream has 'some' trailing whitespace. The\npolicy is to reject \"new\" trailing whitespace and cleanup in stages to\navoid big merge conflicts and stuff.\n\nNow, once the early patches are \"in\" with --whitespace=trim, the\nfollowing patches don't apply anymore :-/ and I can't just trim\nwhitespace in the whole patch series automatically.\n\nIs there any way to get git-apply to ignore whitespace differences\nwhen applying like GNU patch -l?\n\nWhen -3 is passed, it must be calling the merge utility from\nmerge_file() -- which doesn't do 'ignore-whitespace'. But if it's a\nstraight patch application, it should be possible to do something like\nthat... maybe?\n\ncheers,\n\n\n"}]}