Git email flow vs. GitHub flow

Re:Git email flow vs. GitHub flow by WorldMaker on Wednesday March 31, 2021 @12:29PM (#26649278)

I already mentioned `git blame --first-parent` just a few comments up! You get the sha1 referencing a commit that has a title like "Merged PR #327". You can dig down deeper than that --first-parent level if need be, but you have the power of the git graph to show/hide details if when you do/do not need them.

[ Parent | on HN ]

Re:Git email flow vs. GitHub flow by u801e on Wednesday March 31, 2021 @02:42PM (#26651268)

Does the --first-parent flag handle the case where the the line was change as part of a conflict resolution in the merge commit itself?

[ Parent | on HN ]