Merge branch 'maint'

diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt
index f9c4140d3dbf1c23e2ac758ed6317d53fce9bb7c..60d1c52f449ec9e37c2f3d02bc79aa98af86a325 100644 (file)
--- a/Documentation/git-get-tar-commit-id.txt
+++ b/Documentation/git-get-tar-commit-id.txt
@@ -3,25 +3,24 @@ git-get-tar-commit-id(1)
 
 NAME
 ----
-git-get-tar-commit-id - Some git command not yet documented.
+git-get-tar-commit-id - Extract commit ID from an archive created using git-archive
 
 
 SYNOPSIS
 --------
-'git-get-tar-commit-id' [ --option ] <args>...
+'git-get-tar-commit-id' < <tarfile>
+
 
 DESCRIPTION
 -----------
-Does something not yet documented.
-
+Acts as a filter, extracting the commit ID stored in archives created by
+gitlink:git-archive[1].  It reads only the first 1024 bytes of input, thus its
+runtime is not influenced by the size of <tarfile> very much.
 
-OPTIONS
--------
---option::
-       Some option not yet documented.
-
-<args>...::
-       Some argument not yet documented.
+If no commit ID is found, git-get-tar-commit-id quietly exists with a
+return code of 1.  This can happen if <tarfile> had not been created
+using git-archive or if the first parameter of git-archive had been
+a tree ID instead of a commit ID or tag.
 
 
 Author
@@ -34,5 +33,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
-
+Part of the gitlink:git[7] suite