All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: when is "git diff" output suitable for patch?
Date: Thu, 13 Jul 2006 17:31:16 -0400	[thread overview]
Message-ID: <20060713213116.GK19366@fieldses.org> (raw)
In-Reply-To: <7vhd1lurei.fsf@assigned-by-dhcp.cox.net>

On Thu, Jul 13, 2006 at 02:27:33PM -0700, Junio C Hamano wrote:
> "J. Bruce Fields" <bfields@fieldses.org> writes:
> 
> > I assume the -C and -M, -c, and -cc options all result in diff output
> > that can't be correctly applied by "patch" any more?  (Would a patch to
> > the git-diff-files documentation warning about this be helpful?)
> 
> May not be bad to have, except that I do not know if
> "git-diff-files" documentation is the right place to talk about
> it.

OK.

> > Someone I'm working with is having trouble applying patches that they
> > created with a simple "git diff".  The patches in question have some
> > "copy from/copy to" headers.  Should that every happen with just a plain
> > "git diff"?  Is this a bug in their version of git?  (They're on 1.2.4).
> 
> As far as I recall "git diff" never defaulted to -M.

Hm.  Is this related?:

commit 42efbf6d8a5b4902c55a2f6e96034625c056ba1f
Author: Junio C Hamano <junkio@cox.net>
Date:   Sat Mar 11 17:44:10 2006 -0800

    git-diff: -p disables rename detection.

--b.

  reply	other threads:[~2006-07-13 21:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-13 21:21 when is "git diff" output suitable for patch? J. Bruce Fields
2006-07-13 21:27 ` Junio C Hamano
2006-07-13 21:31   ` J. Bruce Fields [this message]
2006-07-13 21:51     ` Junio C Hamano
2006-07-13 21:53       ` J. Bruce Fields

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=20060713213116.GK19366@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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.