git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] diff-raw format update take #2.
Date: Mon, 23 May 2005 15:08:21 -0700	[thread overview]
Message-ID: <7vr7fx1tpm.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vy8a51uay.fsf_-_@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Mon, 23 May 2005 14:55:33 -0700")

Addendum.

------------
Document the diff-helper changes.

Now diff-helper is simple diff-raw to patch format converter
that does not take -R/-M/-C, drop the description of these
options from the documentation. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
cd /opt/packrat/playpen/public/in-place/git/git.junio/
jit-diff
# - HEAD: diff-raw format update take #2.
# + (working tree)
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -9,7 +9,7 @@ git-diff-helper - Generates patch format
 
 SYNOPSIS
 --------
-'git-diff-helper' [-z] [-R] [-M] [-C] [-S<string>]
+'git-diff-helper' [-z] [-S<string>]
 
 DESCRIPTION
 -----------
@@ -21,22 +21,6 @@ OPTIONS
 -z::
 	\0 line termination on input
 
--R::
-	Output diff in reverse.  This is useful for displaying output from
-	"git-diff-cache" which always compares tree with cache or working
-	file.  E.g.
-
-		git-diff-cache <tree> | git-diff-helper -R file.c
-
-	would show a diff to bring the working file back to what
-	is in the <tree>.
-
--M::
-	Detect renames.
-
--C::
-	Detect copies as well as renames.
-
 -S<string>::
 	Look for differences that contains the change in <string>.
 

Compilation finished at Mon May 23 15:06:31


  reply	other threads:[~2005-05-23 22:07 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-23  7:26 [PATCH] Make sure diff-helper can tell rename/copy in the new diff-raw format Junio C Hamano
2005-05-23 14:49 ` Linus Torvalds
2005-05-23 18:43   ` Junio C Hamano
2005-05-23 19:03     ` Linus Torvalds
2005-05-23 19:16       ` Linus Torvalds
2005-05-23 21:55       ` [PATCH] diff-raw format update take #2 Junio C Hamano
2005-05-23 22:08         ` Junio C Hamano [this message]
2005-05-24  0:12         ` Chris Wedgwood
2005-05-24  0:25           ` Junio C Hamano
2005-05-24  0:31             ` Chris Wedgwood
2005-05-24  0:45               ` Junio C Hamano
2005-05-24  1:03                 ` Linus Torvalds
2005-05-24  1:05                   ` Chris Wedgwood
2005-05-24  1:29                   ` David Lang
2005-05-24  1:33                     ` Chris Wedgwood
2005-05-24  1:39                       ` Thomas Glanzmann
     [not found]                         ` <20050524013947.ADFEE528F53@taniwha.stupidest.org>
2005-05-24  1:44                           ` Thomas Glanzmann
2005-05-24  1:50                       ` Linus Torvalds
2005-05-24  0:51               ` Linus Torvalds
2005-05-26  0:55   ` [PATCH] Make sure diff-helper can tell rename/copy in the new diff-raw format Junio C Hamano

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=7vr7fx1tpm.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.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 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 NNTP newsgroup(s).