On Wed, Apr 20, 2011 at 7:48 AM, Steven E. Harris <seh@xxxxxxxxx> wrote: > Is it the case that format-patch will always emit text with LF line > endings, or is it respecting whatever the host platform considers to be > the proper line ending? Is the line ending in use configurable? > > I ask because I see that git-p4 uses format-patch and apply internally > to apply changes against files in the Perforce workspace, and those > files have CRLF line endings, but it looks like format-patch is emitting > patches with LF line endings, and none of those patches will apply > cleanly. > > Perhaps I just need to pipe the output from format-patch through > unix2dos before feeding it to apply, but I'm wondering whether I'm > barking up the wrong tree here. The patch emitted by format-patch should have the correct (original) line-endings, but to preserve them when the patch is applied, git-am needs to be called with --keep-cr (also see config option 'am.keepcr'). j. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html