2009/8/14 PICCA Frédéric-Emmanuel <frederic-emmanuel.picca@xxxxxxxxxxxxxxxxxxxxx>: > mordor% git am /home/picca/Projets/patches/0001-Add-the-POGO-TO-DELETE-comment-to-ComputedAnglesClea.patch > Applying: 'Add the POGO TO DELETE comment to ComputedAnglesClear command' > /tmp/diffractometer/.git/rebase-apply/patch:13: trailing whitespace. > > /tmp/diffractometer/.git/rebase-apply/patch:14: trailing whitespace. > /* POGO TO DELETE */ > error: patch failed: src/Diffractometer/Diffractometer.cpp:2023 > error: src/Diffractometer/Diffractometer.cpp: patch does not apply This patch has DOS line endings (like CR, followed by LF). You can either use dos2unix (or your editor of choice), or update your git to current master branch, where "git am" handles such patches transparently. -- 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