From: Alex Riesen <raa.lkml@gmail.com>
To: "PICCA Frédéric-Emmanuel"
<frederic-emmanuel.picca@synchrotron-soleil.fr>
Cc: git@vger.kernel.org
Subject: Re: trailling whitespace with git am ?
Date: Fri, 14 Aug 2009 22:10:09 +0200 [thread overview]
Message-ID: <81b0412b0908141310x7e4acf4fgf4ea71cf53de6eea@mail.gmail.com> (raw)
In-Reply-To: <606CC410B038E34CB97646A32D0EC0BF0181FAB4@venusbis.synchrotron-soleil.fr>
2009/8/14 PICCA Frédéric-Emmanuel
<frederic-emmanuel.picca@synchrotron-soleil.fr>:
> 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.
next prev parent reply other threads:[~2009-08-14 20:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-14 10:42 trailling whitespace with git am ? PICCA Frédéric-Emmanuel
2009-08-14 20:10 ` Alex Riesen [this message]
2009-08-14 20:21 ` RE : " PICCA Frédéric-Emmanuel
2009-08-14 20:31 ` Junio C Hamano
2009-08-14 20:46 ` RE : " PICCA Frédéric-Emmanuel
-- strict thread matches above, loose matches on Subject: below --
2009-08-14 21:43 Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b0908141310x7e4acf4fgf4ea71cf53de6eea@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=frederic-emmanuel.picca@synchrotron-soleil.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox