Merge branch 'jc/fetch-raw-sha1'

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 9bb4956ccdbef507ab115ac19dfe8ad326afb7c2..d78d6d854e5fa0a2d4f030d821984f3e6827b9c1 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -17,10 +17,10 @@ merge.defaultToUpstream::
        these tracking branches are merged.
 
 merge.ff::
-       By default, git does not create an extra merge commit when merging
+       By default, Git does not create an extra merge commit when merging
        a commit that is a descendant of the current commit. Instead, the
        tip of the current branch is fast-forwarded. When set to `false`,
-       this variable tells git to create an extra merge commit in such
+       this variable tells Git to create an extra merge commit in such
        a case (equivalent to giving the `--no-ff` option from the command
        line). When set to `only`, only such fast-forward merges are
        allowed (equivalent to giving the `--ff-only` option from the
@@ -38,10 +38,10 @@ merge.renameLimit::
        diff.renameLimit.
 
 merge.renormalize::
-       Tell git that canonical representation of files in the
+       Tell Git that canonical representation of files in the
        repository has changed over time (e.g. earlier commits record
        text files with CRLF line endings, but recent ones use LF line
-       endings).  In such a repository, git can convert the data
+       endings).  In such a repository, Git can convert the data
        recorded in commits to a canonical form before performing a
        merge to reduce unnecessary conflicts.  For more information,
        see section "Merging branches with differing checkin/checkout
@@ -52,12 +52,12 @@ merge.stat::
        at the end of the merge.  True by default.
 
 merge.tool::
-       Controls which merge resolution program is used by
-       linkgit:git-mergetool[1].  Valid built-in values are: "araxis",
-       "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld",
-       "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff"
-       and "xxdiff".  Any other value is treated is custom merge tool
-       and there must be a corresponding mergetool.<tool>.cmd option.
+       Controls which merge tool is used by linkgit:git-mergetool[1].
+       The list below shows the valid built-in values.
+       Any other value is treated as a custom merge tool and requires
+       that a corresponding mergetool.<tool>.cmd variable is defined.
+
+include::mergetools-merge.txt[]
 
 merge.verbosity::
        Controls the amount of output shown by the recursive merge