From dc2f8771ba0b38c2b5dbb96a70a4741abc5d95d8 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Tue, 28 Apr 2015 05:18:16 -0700 Subject: [PATCH] README_FIRST: change vX.X.X to vX.X.X^{commit} to avoid ugliness Git has a nasty behavior when merging an annotated/signed tag that we would like to avoid so we need the '^{commit}' suffix. Signed-off-by: Kyle J. McKay --- README_FIRST.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_FIRST.txt b/README_FIRST.txt index 3ec134ed21..ff85f41a92 100644 --- a/README_FIRST.txt +++ b/README_FIRST.txt @@ -40,7 +40,7 @@ staging branch to reflect the change. For example, to update to the Git release tagged as vX.X.X, the following procedure would be used: - git update-ref refs/top-bases/release vX.X.X + git update-ref refs/top-bases/release vX.X.X^{commit} tg update girocco When `tg update girocco` runs it will first merge -- 2.11.4.GIT