Merge branch 'tf/diff-whitespace-incomplete-line' into maint

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 533d18bbd5634bf6197960f546a20772386c824a..fa733214ab0259dec1c866e9cb629dd0e7b69f3a 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -63,6 +63,7 @@ OPTIONS
        are printed when using -l.
        The default is not to print any annotation lines.
        If no number is given to `-n`, only the first line is printed.
+       If the tag is not annotated, the commit message is displayed instead.
 
 -l <pattern>::
        List tags with names that match the given pattern (or all if no pattern is given).