On Wed, Jun 09, 2010 at 10:40:20PM +0200, Matthieu Moy wrote: > Diane Gasselin <diane.gasselin@xxxxxxxxxxxxxxx> writes: > > > From: Diane <diane.gasselin@xxxxxxxxxxxxxxx> > > You did something strange with git format-patch or send-email. This > From header should appear in the header of your email, but not in the > body. The commit author is missing the last name, so send-email correctly includes the extra "From" header. Probably the user.name config variable needs updated (and the commit can be rebased and amended with --reset-author to take the new author). > > +cat> expected2 <<EOF > > +error: Your local changes to the files: > > + a > > +would be overwritten by merge. > > +EOF > > I'd have phrased it like this: > > error: Your local changes to these files would be overwritten by merge: > a > > to avoid splitting the message in two parts. It's more consistant with > the rest of Git (git status or git reset for example). Also, your > version would become hard to read if the file list is long. Yes, I think your version is much more readable. -Peff -- 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