Merge branch 'pb/prepare-commit-msg'

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 6a328f497eb8820eae965ae9f32c28e8aba4c933..170803a6d0ce2e37a3d2bea8199ec7fb5308b261 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 This is usually not what an end user wants to run directly.  See
-gitlink:git-commit[1] instead.
+linkgit:git-commit[1] instead.
 
 Creates a new commit object based on the provided tree object and
 emits the new commit object id on stdout. If no parent is given then
@@ -52,7 +52,7 @@ A commit encapsulates:
 - committer name and email and the commit time.
 
 While parent object ids are provided on the command line, author and
-commiter information is taken from the following environment variables,
+committer information is taken from the following environment variables,
 if set:
 
        GIT_AUTHOR_NAME
@@ -90,7 +90,7 @@ include::i18n.txt[]
 
 See Also
 --------
-gitlink:git-write-tree[1]
+linkgit:git-write-tree[1]
 
 
 Author
@@ -103,4 +103,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[7] suite