From: Junio C Hamano <gitster@pobox.com>
To: Gerrit Pape <pape@smarden.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-diff.txt: add section "output format" describing the diff formats
Date: Wed, 31 Oct 2007 23:33:59 -0700 [thread overview]
Message-ID: <7vir4mcw4o.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071031135916.5625.qmail@134c5e95d8ec4d.315fe32.mid.smarden.org> (Gerrit Pape's message of "Wed, 31 Oct 2007 13:59:16 +0000")
Gerrit Pape <pape@smarden.org> writes:
> diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
> index 0015032..a580f18 100644
> --- a/Documentation/diff-format.txt
> +++ b/Documentation/diff-format.txt
> @@ -1,5 +1,5 @@
> -The output format from "git-diff-index", "git-diff-tree" and
> -"git-diff-files" are very similar.
> +The output format from "git-diff-index", "git-diff-tree",
> +"git-diff-files" and "git diff --raw" are very similar.
I like this attention to the detail of mentioning "--raw".
> @@ -62,9 +62,9 @@ respectively.
> diff format for merges
> ----------------------
>
> -"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option
> -to generate diff output also for merge commits. The output differs
> -from the format described above in the following way:
> +"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
> +'--cc' option to generate diff output also for merge commits. The
> +output differs from the format described above in the following way:
... and this part should do so, too.
prev parent reply other threads:[~2007-11-01 6:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-31 13:59 [PATCH] git-diff.txt: add section "output format" describing the diff formats Gerrit Pape
2007-11-01 6:33 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vir4mcw4o.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pape@smarden.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.