Merge branch 'master' into jc/fsck-reflog

diff --git a/git-tag.sh b/git-tag.sh
index d53f94cd9c618e9c2032d3e6ad7af9f3866e7707..36cd6aa256db765aa741099b8d3c63b50f58048f 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -45,6 +45,17 @@ do
            message_given=1
        fi
        ;;
+    -F)
+       annotate=1
+       shift
+       if test "$#" = "0"; then
+           die "error: option -F needs an argument"
+           exit 2
+       else
+           message="$(cat "$1")"
+           message_given=1
+       fi
+       ;;
     -u)
        annotate=1
        signed=1