summaryrefslogtreecommitdiff
path: root/Documentation/diffcore.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-06-19[PATCH] Rework -B output.Libravatar Junio C Hamano1-0/+9
Patch for a completely rewritten file detected by the -B flag was shown as a pair of creation followed by deletion in earlier versions. This was an misguided attempt to make reviewing such a complete rewrite easier, and unnecessarily ended up confusing git-apply. Instead, show the entire contents of old version prefixed with '-', followed by the entire contents of new version prefixed with '+'. This gives the same easy-to-review for human consumer while keeping it a single, regular modification patch for machine consumption, something that even GNU patch can grok. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-19[PATCH] Update diff documentation.Libravatar Junio C Hamano1-9/+7
This updates diff documentation to discuss --find-copies-harder, and adds descriptions for options that were not described earlier. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-07[PATCH] Documentation: describe diff tweaking (fix).Libravatar Junio C Hamano1-1/+1
I cannot count ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-06-05[PATCH] Documentation: describe diff tweaking.Libravatar Junio C Hamano1-0/+241
This adds documentation for the diffcore mechanism and explains how numeric parameters to -B/-C/-M options affect the output, which was left "black magic" so far. The documentation is not connected to any of the other asciidoc nodes yet. Awaiting for suggestions, fixes and help from other people. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>