git tag名和branch名 重名时怎么区分

本文介绍了如何使用Git命令来合并指定的分支(branch)和标签(tag),提供了具体的命令实例,帮助开发者更好地掌握版本控制技巧。

例如:

branch:v21.08

tag:v21.08

// 合并branch
git merge refs/heads/v21.08

// 合并tag
git merge refs/tags/v21.08

#!/bin/bash # # Copyright 2016-present the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # set -e cd ../../ type="" # shellcheck disable=SC2092 # shellcheck disable=SC2006 if `git status | grep "develop" &>/dev/null`; then type="develop" fi # shellcheck disable=SC2092 # shellcheck disable=SC2006 if `git status | grep "release" &>/dev/null`; then type="release" fi # shellcheck disable=SC2092 # shellcheck disable=SC2006 if `git status | grep "main" &>/dev/null`; then type="release" fi if [[ ${type} == "" ]]; then echo -e "This branch doesn't support tagging, please switch to the \033[31mdevelop\033[0m or \033[31mrelease\033[0m branch." exit fi git pull --tags # shellcheck disable=SC2046 # shellcheck disable=SC2116 tag=$(echo dc3.${type}.$(date +'%Y%m%d').$(git tag -l "dc3.${type}.$(date +'%Y%m%d').*" | wc -l | xargs printf '%02d')) echo "${tag}" git tag "${tag}" git push origin --tags 这是一个sh文件,请告诉我给我解释这个文件是干什么的
最新发布
11-22
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值