{"thread":{"id":"37001","subject":"[BUG/RFC] cherry-pick adds newline to last line of file","startedAt":"2014-06-26T09:30:29Z","lastAt":"2014-06-26T09:30:29Z","messageCount":1,"participants":["Max Kirillov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"245014","messageId":"CAF7_NFQopk_1xh1OJyOARuXYYcM7MYdqV=tB5nQoZjSJoZZU=Q@mail.gmail.com","threadId":"37001","inReplyTo":null,"subject":"[BUG/RFC] cherry-pick adds newline to last line of file","fromName":"Max Kirillov","fromEmail":"max@max630.net","sentAt":"2014-06-26T09:30:29Z","receivedAt":"2014-06-26T09:30:29Z","isPatch":false,"sender":{"key":"max@max630.net","avatar":"https://avatars.githubusercontent.com/u/381560?v=4"},"body":"Hi.\n\nIf a file does not contain newline in the last line, and the file has\nchanged somewhere\nin other branch, and the newline has not been not added in that\nchange, when I cherry-pick the commit, the commit does contain the\nnewline in the last line. This sometimes leads to conflict and in\ngeneral looks unexpected.\n\nSuch files are not uncommon nowadays and however bad it is, I think\nmerging and cherry-picking should try to keep is as long as the\nnewline is not added in some of the changes. Are there any option to\npreserve the absence of the closing newline? Or maybe the commands\nshould preserve it unconditionally?\n\n-- \nMax\n"}]}