简体   繁体   English

列出两个分支之间合并分支的差异

[英]List difference of Merged branches between two branches

For every feature/bug we create a new branch out of production branch, and merge to development branch for testing对于每个功能/错误,我们从production分支创建一个新分支,并合并到development分支进行测试

Approved feature getting merged to production and Un-approved stayed at development (development-1.0) branch.已批准的功能合并到production ,未批准的功能留在development (development-1.0) 分支。

After lot of un-approved features, there was discrepancy b/w production and development branch.在许多未经批准的功能之后, productiondevelopment分支存在黑白差异。

So, we created a new development (development-2.0) branch out of production , and started merging on that.因此,我们创建了一个新的development (发展-2.0)分支出来的production ,并开始合并上。

Now, want to list the difference of branches that were merged to development-1.0 and development-2.0现在,要列出合并到development-1.0development-2.0的分支的差异

You can use git log to list commits which are in one branch but not in another.您可以使用git log列出在一个分支中但不在另一个分支中的提交。

git log development-1.0..development-2.0 # commits in development-2.0 not in development-1.0
git log development-2.0..development-1.0 # commits in development-1.0 not in development-2.0

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM