Merge branch 'maint' to catch up with 1.5.3.5

[git.git] / Documentation / git-commit-tree.txt

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 6a328f497eb8820eae965ae9f32c28e8aba4c933..a2537e179ab4602090df28a0ee7e4dabda36064f 100644 (file)
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -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