qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Christian MICHON" <christian.michon@gmail.com>
To: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...
Date: Mon, 17 Sep 2007 10:27:13 +0200	[thread overview]
Message-ID: <46d6db660709170127t415b3a06vbef6c5dd19cd172f@mail.gmail.com> (raw)
In-Reply-To: <1190016521.14938.148.camel@rapid>

On 9/17/07, J. Mayer <l_indien@magic.fr> wrote:
> > Log message:
> >       find -type f | xargs sed -i 's/[\t ]$//g' # on most files
>
> Many thanks for generating hundreds of conflicts with a useless commit.
> Don't know what's wrong in your expression but it did not what you think
> it should (and you did not even check....).
>
> DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
>

if we were using git (but you can do it locally anyway), you would not
have these conflicts problems...

git-apply indead has this feature about ignoring useless whitespaces...

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !

  reply	other threads:[~2007-09-17  8:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-16 21:08 [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae Thiemo Seufer
2007-09-17  8:08 ` J. Mayer
2007-09-17  8:27   ` Christian MICHON [this message]
2007-09-17  9:42     ` J. Mayer
2007-09-17 10:00       ` Johannes Schindelin
2007-09-17 11:19         ` Philip Boulain
2007-09-17 12:18           ` Christian MICHON
2007-09-17 20:59             ` Andreas Färber
2007-09-17 21:14               ` Luca
2007-09-17 21:46                 ` J. Mayer
2007-09-17 22:02                   ` Luca
2007-09-18 13:21                   ` Thiemo Seufer
2007-09-17 21:30               ` Christian MICHON
2007-09-17 22:47               ` Johannes Schindelin
2007-09-18 16:20                 ` Andreas Färber
2007-09-17  9:21   ` Johannes Schindelin
2007-09-17 14:52     ` M. Warner Losh
2007-09-17 13:52   ` Thiemo Seufer
  -- strict thread matches above, loose matches on Subject: below --
2007-09-17 23:56 Ben Taylor
2007-09-18 12:49 ` Philip Boulain
2007-09-18 17:05   ` Stefan Weil

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=46d6db660709170127t415b3a06vbef6c5dd19cd172f@mail.gmail.com \
    --to=christian.michon@gmail.com \
    --cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).