Move better_branch_name above get_ref in merge-recursive.

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