[{"createTime":1735734952000,"id":1,"img":"hwy_ms_500_252.jpeg","link":"https://activity.huaweicloud.com/cps.html?fromacct=261f35b6-af54-4511-a2ca-910fa15905d1&utm_source=V1g3MDY4NTY=&utm_medium=cps&utm_campaign=201905","name":"华为云秒杀","status":9,"txt":"华为云38元秒杀","type":1,"updateTime":1735747411000,"userId":3},{"createTime":1736173885000,"id":2,"img":"txy_480_300.png","link":"https://cloud.tencent.com/act/cps/redirect?redirect=1077&cps_key=edb15096bfff75effaaa8c8bb66138bd&from=console","name":"腾讯云秒杀","status":9,"txt":"腾讯云限量秒杀","type":1,"updateTime":1736173885000,"userId":3},{"createTime":1736177492000,"id":3,"img":"aly_251_140.png","link":"https://www.aliyun.com/minisite/goods?userCode=pwp8kmv3","memo":"","name":"阿里云","status":9,"txt":"阿里云2折起","type":1,"updateTime":1736177492000,"userId":3},{"createTime":1735660800000,"id":4,"img":"vultr_560_300.png","link":"https://www.vultr.com/?ref=9603742-8H","name":"Vultr","status":9,"txt":"Vultr送$100","type":1,"updateTime":1735660800000,"userId":3},{"createTime":1735660800000,"id":5,"img":"jdy_663_320.jpg","link":"https://3.cn/2ay1-e5t","name":"京东云","status":9,"txt":"京东云特惠专区","type":1,"updateTime":1735660800000,"userId":3},{"createTime":1735660800000,"id":6,"img":"new_ads.png","link":"https://www.iodraw.com/ads","name":"发布广告","status":9,"txt":"发布广告","type":1,"updateTime":1735660800000,"userId":3},{"createTime":1735660800000,"id":7,"img":"yun_910_50.png","link":"https://activity.huaweicloud.com/discount_area_v5/index.html?fromacct=261f35b6-af54-4511-a2ca-910fa15905d1&utm_source=aXhpYW95YW5nOA===&utm_medium=cps&utm_campaign=201905","name":"底部","status":9,"txt":"高性能云服务器2折起","type":2,"updateTime":1735660800000,"userId":3}]
<>需求场景
有些时候在使用微服务的时候有点配置在本地有些修改，但是push的时候又不想push到远端分支上去。这个时候可以让git忽略对这几个文件的跟踪，达到不提交修改内容的效果。
<>上demo
1-查看哪些文件被修改了
git status -s
2-让git忽略对这些文件的跟踪
git update-index --assume-unchanged 上面git status -s打印出来的文件路径 #比如 #git
update-index --assume-unchanged
sp_edaijia/protected/controllers/ApiController.php
3-查看是否忽略成功
git status -s
4-查看所有被忽略跟踪的文件
git ls-files -v | grep '^h\ '
5-对被忽略的文件重新恢复跟踪
git update-index --no-assume-unchanged 文件路径
6-所有被忽略的文件，取消忽略
git ls-files -v | grep '^h' | awk '{print $2}' |xargs git update-index
--no-assume-unchanged
<>方法二
建多个changeList，在git提交的时候可以选择change list来commit push
<>撤销本地merge
git merge --abort
<>撤回本地commit
#–soft 不删除工作空间改动代码，撤销commit，不撤销git add . #–hard 删除工作空间改动代码，撤销commit，撤销git add .
#HEAD^ 的意思是上一个版本，也可以写成HEAD~1 #如果你进行了2次commit，想都撤回，可以使用HEAD~2 git reset --soft
HEAD^
<>修改commit注释
git commit --amend
