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

diff --git a/Documentation/howto/make-dist.txt b/Documentation/howto/make-dist.txt
index 132d5eca66ecd095c14b07a3c6a01fd9abc125bd..00e330b29357ee2edfb37b0d0076747afe75d7e2 100644 (file)
--- a/Documentation/howto/make-dist.txt
+++ b/Documentation/howto/make-dist.txt
@@ -32,7 +32,7 @@ This is my crappy "release-script":
         stable="$1"
         last="$2"
         new="$3"
-        echo "# git-tag-script v$new"
+        echo "# git-tag v$new"
         echo "git-tar-tree v$new linux-$new | gzip -9 > ../linux-$new.tar.gz"
         echo "git-diff-tree -p v$stable v$new | gzip -9 > ../patch-$new.gz"
         echo "git-rev-list --pretty v$new ^v$last > ../ChangeLog-$new"