Repository navigation
Is three a way to do three dot diff between two branches? #1426
Description
Activity
I believe I have worked around in following way:
def three_dot_diff_with_master(repo): # might be slow when the commit tree is very big master_commits = repo.iter_commits('origin/master') local_commits = set(repo.iter_commits('HEAD')) for commit in master_commits : if commit in local_commits: break diffs = commit.diff(repo.head.commit)I believe this issue can now be closed. But I'll leave the decision to the project admin.
Thank you- locked and limited conversation to collaborators
on Apr 11, 2022
In command line, I can do
git diff master..branchand alsogit diff master...branch. However, in gitPython, it seems thecommit.diff(commit2)is only doing two dot diff. And I couldn't find a way to do three dot diff directly (I have searched through the document and googled around).I am thinking to find the commit where we branch off, and then do a two way diff - this would be the same as the three way diff of two branches. But it does not work exactly as expected:
Would you have any recommendation?
Thank you.