sha1_file: reorder code in prepare_packed_git_one()

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 89dd634674054b4d0ba485a8010f40581f99d154..7c70c2a2feca88a2c1247794e2ee0fbed767bb4a 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -57,8 +57,8 @@ diff.statGraphWidth::
        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.
+       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
@@ -99,7 +99,7 @@ diff.renameLimit::
        detection; equivalent to the 'git diff' option '-l'.
 
 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.
 
@@ -149,9 +149,10 @@ diff.<driver>.cachetextconv::
        conversion outputs.  See linkgit:gitattributes[5] for details.
 
 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[]