Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / Documentation / git-patch-id.txt

diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index b6fa2a8..723b8cc 100644 (file)
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -3,7 +3,7 @@ git-patch-id(1)
 
 NAME
 ----
 
 NAME
 ----

-git-patch-id - Generate a patch ID.
+git-patch-id - Generate a patch ID

 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------


@@ -18,6 +18,12 @@ ID" are almost guaranteed to be the same thing.
 
 IOW, you can use this thing to look for likely duplicate commits.
 
 
 IOW, you can use this thing to look for likely duplicate commits.
 

+When dealing with git-diff-tree output, it takes advantage of
+the fact that the patch is prefixed with the object name of the
+commit, and outputs two 40-byte hexadecimal string.  The first
+string is the patch ID, and the second string is the commit ID.
+This can be used to make a mapping from patch ID to commit ID.
+

 OPTIONS
 -------
 <patch>::
 OPTIONS
 -------
 <patch>::


@@ -33,5 +39,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite