Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix recent documentation format breakage.
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
raw
|
patch
|
inline
| side by side (parent:
8d7d167
)
diff --git
a/Documentation/diffcore.txt
b/Documentation/diffcore.txt
index c9134def146c2ef98380de2af22799c1db04303f..cb4e562004e58439a0055d9ed6a6bdab249dfcdc 100644
(file)
--- a/
Documentation/diffcore.txt
+++ b/
Documentation/diffcore.txt
@@
-68,7
+68,7
@@
diff-patch format.
diffcore-pathspec: For Ignoring Files Outside Our Consideration
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
The first transformation in the chain is diffcore-pathspec, and
is controlled by giving the pathname parameters to the
@@
-92,7
+92,7
@@
use diffcore-pathspec, but the end result is the same.
diffcore-break: For Splitting Up "Complete Rewrites"
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
The second transformation in the chain is diffcore-break, and is
controlled by the -B option to the git-diff-* commands. This is
@@
-127,7
+127,7
@@
after "-B" option (e.g. "-B75" to tell it to use 75%).
diffcore-rename: For Detection Renames and Copies
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
This transformation is used to detect renames and copies, and is
controlled by the -M option (to detect renames) and the -C option
@@
-185,7
+185,7
@@
copied happened to have been modified in the same changeset.
diffcore-merge-broken: For Putting "Complete Rewrites" Back Together
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
This transformation is used to merge filepairs broken by
diffcore-break, and not transformed into rename/copy by
@@
-227,7
+227,7
@@
version prefixed with '+'.
diffcore-pickaxe: For Detecting Addition/Deletion of Specified String
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
This transformation is used to find filepairs that represent
changes that touch a specified string, and is controlled by the
@@
-250,7
+250,7
@@
changeset easier.
diffcore-order: For Sorting the Output Based on Filenames
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
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