Changeset 782 for git/branches/dmik/Documentation/diff-config.txt

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• Documentation/diff-config.txt (modified) (6 diffs)

git/branches/dmik/Documentation/diff-config.txt ¶

@@ -53 +53 @@
 `files,10,cumulative`.
 
+diff.statGraphWidth::
+        Limit the width of the graph part in --stat output. If set, applies
+        to all commands generating --stat output except format-patch.
+
+diff.context::
+        Generate diffs with <n> lines of context instead of the default
+        of 3. This value is overridden by the -U option.
+
 diff.external::
         If this config variable is set, diff generation is not
@@ -66 +74 @@
         affects only 'git diff' Porcelain, and not lower level 'diff'
         commands such as 'git diff-files'. 'git checkout' also honors
-        this setting when reporting uncommitted changes.
+        this setting when reporting uncommitted changes. Setting it to
+        'all' disables the submodule summary normally shown by 'git commit'
+        and 'git status' when 'status.submodulesummary' is set unless it is
+        overridden by using the --ignore-submodules command line option.
+        The 'git submodule' commands are not affected by this setting.
 
 diff.mnemonicprefix::
@@ -87 +99 @@
         If set, 'git diff' does not show any source or destination prefix.
 
+diff.orderfile::
+        File indicating how to order files within a diff, using
+        one shell glob pattern per line.
+        Can be overridden by the '-O' option to linkgit:git-diff[1].
+
 diff.renameLimit::
         The number of files to consider when performing the copy/rename
@@ -92 +109 @@
 
 diff.renames::
-        Tells git to detect renames.  If set to any boolean value, it
+        Tells Git to detect renames.  If set to any boolean value, it
         will enable basic rename detection.  If set to "copies" or
         "copy", it will detect copies, as well.
@@ -99 +116 @@
         A boolean to inhibit the standard behavior of printing a space
         before each empty output line. Defaults to false.
+
+diff.submodule::
+        Specify the format in which differences in submodules are
+        shown.  The "log" format lists the commits in the range like
+        linkgit:git-submodule[1] `summary` does.  The "short" format
+        format just shows the names of the commits at the beginning
+        and end of the range.  Defaults to short.
+
+diff.wordRegex::
+        A POSIX Extended Regular Expression used to determine what is a "word"
+        when performing word-by-word difference calculations.  Character
+        sequences that match the regular expression are "words", all other
+        characters are *ignorable* whitespace.
 
 diff.<driver>.command::
@@ -129 +159 @@
 
 diff.tool::
-        The diff tool to be used by linkgit:git-difftool[1].  This
-        option overrides `merge.tool`, and has the same valid built-in
-        values as `merge.tool` minus "tortoisemerge" and plus
-        "kompare".  Any other value is treated as a custom diff tool,
-        and there must be a corresponding `difftool.<tool>.cmd`
-        option.
+        Controls which diff tool is used by linkgit:git-difftool[1].
+        This variable overrides the value configured in `merge.tool`.
+        The list below shows the valid built-in values.
+        Any other value is treated as a custom diff tool and requires
+        that a corresponding difftool.<tool>.cmd variable is defined.
+
+include::mergetools-diff.txt[]
+
+diff.algorithm::
+        Choose a diff algorithm.  The variants are as follows:
++
+--
+`default`, `myers`;;
+        The basic greedy diff algorithm. Currently, this is the default.
+`minimal`;;
+        Spend extra time to make sure the smallest possible diff is
+        produced.
+`patience`;;
+        Use "patience diff" algorithm when generating patches.
+`histogram`;;
+        This algorithm extends the patience algorithm to "support
+        low-occurrence common elements".
+--
++