From: Junio C Hamano Date: Wed, 28 Sep 2011 03:10:25 GMT Subject: Re: [PATCH] notes_merge_commit(): do not pass temporary buffer to other function Message-ID: <7vty7xs6ou.fsf@alter.siamese.dyndns.org> In-Reply-To: <4E828B6C.1010707@alum.mit.edu> Michael Haggerty writes: >>> diff --git notes-merge.c notes-merge.c >>> index e1aaf43..baaf31f 100644 >>> --- notes-merge.c >>> +++ notes-merge.c >> >> It is Ok to play with -p0 yourself but please don't do that in the public. > > Sorry; I had set diff.noprefix=true, not realizing that it would affect > things like "git format-patch". It also confused emacs' magit mode, and > probably some other tools. It's now set permanently back to false. Thanks. It is nothing catastrophic (I applied it with "am -p0 -s3c" just fine), but everybody here sends -p1 format, so...