Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index cb8d6aadeb3fc3b55c58bd40b96461a07a124260..26d3850e7317c22dcf0999e0c4a6afe9a5ea2e03 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -8,7 +8,7 @@ git-write-tree - Create a tree object from the current index
 
 SYNOPSIS
 --------
-'git-write-tree' [--missing-ok] [--prefix=<prefix>/]
+'git write-tree' [--missing-ok] [--prefix=<prefix>/]
 
 DESCRIPTION
 -----------
@@ -16,17 +16,17 @@ Creates a tree object using the current index.
 
 The index must be in a fully merged state.
 
-Conceptually, `git-write-tree` sync()s the current index contents
+Conceptually, 'git-write-tree' sync()s the current index contents
 into a set of tree files.
 In order to have that match what is actually in your directory right
-now, you need to have done a `git-update-index` phase before you did the
-`git-write-tree`.
+now, you need to have done a 'git-update-index' phase before you did the
+'git-write-tree'.
 
 
 OPTIONS
 -------
 --missing-ok::
-       Normally `git-write-tree` ensures that the objects referenced by the
+       Normally 'git-write-tree' ensures that the objects referenced by the
        directory exist in the object database.  This option disables this
        check.
 
@@ -46,4 +46,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite