summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8d7d167)
raw | patch | inline | side by side (parent: 8d7d167)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 29 Oct 2005 07:50:42 +0000 (00:50 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 29 Oct 2005 07:50:42 +0000 (00:50 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/diffcore.txt | patch | blob | history |
index c9134def146c2ef98380de2af22799c1db04303f..cb4e562004e58439a0055d9ed6a6bdab249dfcdc 100644 (file)
diffcore-pathspec: For Ignoring Files Outside Our Consideration
------------------
+---------------------------------------------------------------
The first transformation in the chain is diffcore-pathspec, and
is controlled by giving the pathname parameters to the
diffcore-break: For Splitting Up "Complete Rewrites"
---------------
+----------------------------------------------------
The second transformation in the chain is diffcore-break, and is
controlled by the -B option to the git-diff-* commands. This is
diffcore-rename: For Detection Renames and Copies
----------------
+-------------------------------------------------
This transformation is used to detect renames and copies, and is
controlled by the -M option (to detect renames) and the -C option
diffcore-merge-broken: For Putting "Complete Rewrites" Back Together
----------------------
+--------------------------------------------------------------------
This transformation is used to merge filepairs broken by
diffcore-break, and not transformed into rename/copy by
diffcore-pickaxe: For Detecting Addition/Deletion of Specified String
-----------------
+---------------------------------------------------------------------
This transformation is used to find filepairs that represent
changes that touch a specified string, and is controlled by the
diffcore-order: For Sorting the Output Based on Filenames
---------------
+---------------------------------------------------------
This is used to reorder the filepairs according to the user's
(or project's) taste, and is controlled by the -O option to the