From: Tomas Carnecky <tom@dbservice.com>
To: David Chanters <david.chanters@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: Creating CVS-style patch headers with git-diff
Date: Sat, 08 Jan 2011 12:49:43 +0100 [thread overview]
Message-ID: <4D284F57.2000808@dbservice.com> (raw)
In-Reply-To: <AANLkTinmq=3kJmtSVutf7dHAQ0QL3fr9_E3hZ7gDe1JY@mail.gmail.com>
On 1/8/11 12:23 PM, David Chanters wrote:
> Hi all,
>
> [ Please Cc me on any replies as I am not subscribed to this list, thanks. ]
>
> I am wondering if I can get git diff to create "CVS-style patches"?
> What do I mean by that? Well, whenever I do:
>
> git diff
>
> I get patch headers in the form:
>
> diff --git a/foo.c b/foo.c
> index 57b9527..a2d947b 100644
> --- a/foo.c
> +++ b/foo.c
>
> This is fine for git, but if I then want to import the same patch into
> CVS I have to either edit the patch, or mess around with the -p option
> to patch(1).
What exactly do you need to change in the patch? Remove the index line?
The '--git' string? Remove or change the a/, b/ prefix?
> I have seen that git-diff has options to change the a/ b/ headers --
> can anyone shed some light on this as to what I can do?
Are you maybe looking for the --no-prefix option?
tom
next prev parent reply other threads:[~2011-01-08 11:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-08 11:23 Creating CVS-style patch headers with git-diff David Chanters
2011-01-08 11:49 ` Tomas Carnecky [this message]
2011-01-08 13:43 ` David Chanters
2011-01-08 15:21 ` Andreas Schwab
2011-01-08 15:35 ` David Chanters
2011-01-08 15:51 ` Tomas Carnecky
2011-01-08 16:17 ` Andreas Schwab
2011-01-08 15:26 ` Tomas Carnecky
2011-01-08 16:35 ` Robin Rosenberg
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=4D284F57.2000808@dbservice.com \
--to=tom@dbservice.com \
--cc=david.chanters@googlemail.com \
--cc=git@vger.kernel.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.