由于公司对版本提交日志进行检查,如果不符合要求,则push失败。
以下是修改commit日志的方法:
1.进入到提交代码文件所在目录,即git所在目录下
bash
cd app-repository
2.git log
bash
git log
commit bf29e3e5e799d364fe2975677baf18c9186a242c
Author: ruiliu <ruiliu@asiainfo.com>
Date: Fri Aug 4 10:09:51 2023 +0800
[tag]:[tag新版本]
commit c9e7d47d00562facdaae10882610723ee8f5c1f0
Author: ruiliu <ruiliu@asiainfo.com>
Date: Wed Aug 2 23:10:49 2023 +0800
update
Merge remote-tracking branch 'origin/master'
3.发现是,第2条,不符合规范,导致后来符合规范的提交也提交不上去
执行 git rebase -i HEAD~2
bash
# git rebase -i HEAD~2
Stopped at c9e7d47... update
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
进入到rebase流程。
按照提示的流程继续执行
4.git commit --amend
bash
# git commit --amend
[detached HEAD f0eccc8] [tag]:[新版本]
1 file changed, 10 insertions(+)
会显示很多命令,我们是要修改,所以将命令参数改为 e
5.git rebase --continue
bash
git rebase --continue
# Successfully rebased and updated refs/heads/master.
6.git log 再次查看,已经修改完成
bash
git log
commit 82856b8b9139d51384eabb073e3e1a46c3824b69
Author: ruiliu <ruiliu@asiainfo.com>
Date: Fri Aug 4 10:09:51 2023 +0800
[tag]:[新版本]
commit f0eccc89e2083987fe812f72e1b099df4dd9eeaf
Author: ruiliu <ruiliu@asiainfo.com>
Date: Wed Aug 2 23:10:49 2023 +0800
[tag]:[新版本]
Merge remote-tracking branch 'origin/master'
7.重新push下,即可
bash
# ./git-auto-commit-total.sh
git pull no1
From http://哈哈哈哈哈哈哈app-repository
* branch HEAD -> FETCH_HEAD
Already up-to-date.
正在做哈哈哈哈的提交操作
[master f1af787] [tag]:[修改页面格式]
1 file changed, 10 insertions(+)
# On branch master
nothing to commit, working directory clean
Counting objects: 15, done.
Delta compression using up to 16 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.06 KiB | 0 bytes/s, done.
Total 12 (delta 9), reused 0 (delta 0)
To http://哈哈哈哈app-repository.git
91d1505..f1af787 master -> master
完成哈哈哈哈的提交操作
=======================================================