Merge branch 'pb/cvsimport'

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 10d3e3fa950e00b6004f968ff2c41477e1d57612..b62a3d1c5896a3b2e32af58029115240d609f37b 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -65,7 +65,9 @@ OPTIONS
        Typing "git tag" without arguments, also lists all tags.
 
 -m <msg>::
-       Use the given tag message (instead of prompting)
+       Use the given tag message (instead of prompting).
+       If multiple `-m` options are given, there values are
+       concatenated as separate paragraphs.
 
 -F <file>::
        Take the tag message from the given file.  Use '-' to
@@ -246,4 +248,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