Work around missing hard links on FAT formatted media

[git.git] / Documentation / diffcore.txt

diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 1a6e725..7c2168a 100644 (file)
--- a/Documentation/diffcore.txt
+++ b/Documentation/diffcore.txt
@@ -6,7 +6,7 @@ June 2005
 Introduction
 ------------
 
 Introduction
 ------------
 

-The diff commands git-diff-cache, git-diff-files, and
+The diff commands git-diff-index, git-diff-files, and

 git-diff-tree can be told to manipulate differences they find
 in unconventional ways before showing diff(1) output.  The
 manipulation is collectively called "diffcore transformation".
 git-diff-tree can be told to manipulate differences they find
 in unconventional ways before showing diff(1) output.  The
 manipulation is collectively called "diffcore transformation".


@@ -21,9 +21,9 @@ The chain of operation
 The git-diff-* family works by first comparing two sets of
 files:
 
 The git-diff-* family works by first comparing two sets of
 files:
 

- - git-diff-cache compares contents of a "tree" object and the
-   working directory (when '--cached' flag is not used) or a
-   "tree" object and the index file (when '--cached' flag is
+ - git-diff-index compares contents of a "tree" object and the
+   working directory (when '\--cached' flag is not used) or a
+   "tree" object and the index file (when '\--cached' flag is

    used);
 
  - git-diff-files compares contents of the index file and the
    used);
 
  - git-diff-files compares contents of the index file and the


@@ -164,11 +164,11 @@ similarity score different from the default 50% by giving a
 number after "-M" or "-C" option (e.g. "-M8" to tell it to use
 8/10 = 80%).
 
 number after "-M" or "-C" option (e.g. "-M8" to tell it to use
 8/10 = 80%).
 

-Note.  When the "-C" option is used with --find-copies-harder
+Note.  When the "-C" option is used with `\--find-copies-harder`

 option, git-diff-\* commands feed unmodified filepairs to
 diffcore mechanism as well as modified ones.  This lets the copy
 detector consider unmodified files as copy source candidates at
 option, git-diff-\* commands feed unmodified filepairs to
 diffcore mechanism as well as modified ones.  This lets the copy
 detector consider unmodified files as copy source candidates at

-the expense of making it slower.  Without --find-copies-harder,
+the expense of making it slower.  Without `\--find-copies-harder`,

 git-diff-\* commands can detect copies only if the file that was
 copied happened to have been modified in the same changeset.
 
 git-diff-\* commands can detect copies only if the file that was
 copied happened to have been modified in the same changeset.
 


@@ -177,7 +177,7 @@ diffcore-merge-broken
 ---------------------
 
 This transformation is used to merge filepairs broken by
 ---------------------
 
 This transformation is used to merge filepairs broken by

-diffcore-break, and were not transformed into rename/copy by
+diffcore-break, and not transformed into rename/copy by

 diffcore-rename, back into a single modification.  This always
 runs when diffcore-break is used.
 
 diffcore-rename, back into a single modification.  This always
 runs when diffcore-break is used.
 


@@ -206,10 +206,10 @@ like these:
 * -B/60 (the same as above, since diffcore-break defaults to 50%).
 
 Note that earlier implementation left a broken pair as a separate
 * -B/60 (the same as above, since diffcore-break defaults to 50%).
 
 Note that earlier implementation left a broken pair as a separate

-creation and deletion patches.  This was unnecessary hack and
+creation and deletion patches.  This was an unnecessary hack and

 the latest implementation always merges all the broken pairs
 back into modifications, but the resulting patch output is
 the latest implementation always merges all the broken pairs
 back into modifications, but the resulting patch output is

-formatted differently to still let the reviewing easier for such
+formatted differently for easier review in case of such

 a complete rewrite by showing the entire contents of old version
 prefixed with '-', followed by the entire contents of new
 version prefixed with '+'.
 a complete rewrite by showing the entire contents of old version
 prefixed with '-', followed by the entire contents of new
 version prefixed with '+'.


@@ -220,7 +220,7 @@ diffcore-pickaxe
 
 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

--S option and the --pickaxe-all option to the git-diff-*
+-S option and the `\--pickaxe-all` option to the git-diff-*

 commands.
 
 When diffcore-pickaxe is in use, it checks if there are
 commands.
 
 When diffcore-pickaxe is in use, it checks if there are


@@ -229,9 +229,9 @@ whose "result" side does not.  Such a filepair represents "the
 string appeared in this changeset".  It also checks for the
 opposite case that loses the specified string.
 
 string appeared in this changeset".  It also checks for the
 opposite case that loses the specified string.
 

-When --pickaxe-all is not in effect, diffcore-pickaxe leaves
+When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves

 only such filepairs that touches the specified string in its
 only such filepairs that touches the specified string in its

-output.  When --pickaxe-all is used, diffcore-pickaxe leaves all
+output.  When `\--pickaxe-all` is used, diffcore-pickaxe leaves all

 filepairs intact if there is such a filepair, or makes the
 output empty otherwise.  The latter behaviour is designed to
 make reviewing of the changes in the context of the whole
 filepairs intact if there is such a filepair, or makes the
 output empty otherwise.  The latter behaviour is designed to
 make reviewing of the changes in the context of the whole


@@ -250,15 +250,15 @@ pattern.  Filepairs that match a glob pattern on an earlier line
 in the file are output before ones that match a later line, and
 filepairs that do not match any glob pattern are output last.
 
 in the file are output before ones that match a later line, and
 filepairs that do not match any glob pattern are output last.
 

-As an example, typical orderfile for the core GIT probably
+As an example, typical orderfile for the core git probably

 would look like this:
 
 ------------------------------------------------
 would look like this:
 
 ------------------------------------------------

-    README
-    Makefile
-    Documentation
-    *.h
-    *.c
-    t
+README
+Makefile
+Documentation
+*.h
+*.c
+t

 ------------------------------------------------
 
 ------------------------------------------------