Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: when is "git diff" output suitable for patch?

From: J. Bruce Fields <hidden>
Date: 2016-06-15 22:42:33

On Thu, Jul 13, 2006 at 02:27:33PM -0700, Junio C Hamano wrote:
"J. Bruce Fields" [off-list ref] writes:
quoted
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.
quoted
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 [off-list ref]
Date:   Sat Mar 11 17:44:10 2006 -0800

    git-diff: -p disables rename detection.

--b.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help