From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Oct 2010 04:43:27 GMT
Subject: Re: [PATCH] Improve the "diff --git" format documentation
Message-ID: <7vvd515t00.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101014161636.GB16500@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> ...
> At some point, the reader starts to wonder what "it" is. :)   (2)
> already has this problem, since the extended header lines actually
> precede the traditional diff rather than following it.
>
> How about:
> 
> 	What the -p option produces is slightly different[...]
>
> 	1. It is preceded with a "git diff" header[...]
> 	2. Next comes one or more extended header lines[...]
> 	3. The from-file/to-file header that follows uses filenames
> 	of the form a/file1 and b/file2 (where "a/" and "b/" can be
> 	replaced with some other string or removed depending on
> 	options used):
>
> 		--- a/file1
> 		+++ b/file2
>
> 	This header is omitted if[...]
> 	4. TAB, LF, double quote, and [...]

Quite sensible point to raise, which I completely missed.  Thanks.