How can i get the program name list of codes which changed both in two branches when i run "git merg

When I run “git merge” from dev-A tp dev-B, I input the following commands in the console.

git checkout dev-A
git checkout dev-B
git merge dev-A &> LOG

And after that, what can i get in the LOG is the program name which has been changed in branch dev-A, whether it just fast forward into the dev-B or make conflicts when merging.
But I want the program list without the program whose codes just are changed in the dev-A only. It means I want the program list whose codes are changed both in dev-A and dev-B,including the one which make confilcts in merging and the other one not.
I draw a picture to discuribe the situation.
And I want the green part and the red part in the picture.
在这里插入图片描述

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

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

抵扣说明:

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

余额充值