git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Andreas Gruenbacher <agruen@suse.de>, git@vger.kernel.org
Subject: Re: [PATCH] Improve the "diff --git" format documentation
Date: Sat, 16 Oct 2010 21:43:27 -0700	[thread overview]
Message-ID: <7vvd515t00.fsf@alter.siamese.dyndns.org> (raw)
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.

      reply	other threads:[~2010-10-17  4:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-06 16:23 [PATCH] Improve the "diff --git" format documentation Andreas Gruenbacher
2010-10-06 17:22 ` Junio C Hamano
2010-10-06 23:03   ` Andreas Gruenbacher
2010-10-11 13:14     ` Andreas Gruenbacher
2010-10-14  1:55       ` Junio C Hamano
2010-10-14  1:55     ` Junio C Hamano
2010-10-14 10:53       ` Andreas Gruenbacher
2010-10-14 12:39       ` Andreas Gruenbacher
2010-10-14 16:16         ` Jonathan Nieder
2010-10-17  4:43           ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vvd515t00.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=agruen@suse.de \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).