TortoiseGitBlame should have an option to show merges instead of checkpoint commits
If you are using the workflow where you squash every merge, this feature request is not for you. :)
But if you keep branch commits, it would be very useful to have an option to show the commit when a line was merged into the current branch instead of showing the commit on the branch.
This can be achieved in the following way:
- Before running
git blame, rungit rev-list --first-parent HEAD(or the respective Ref) - Prepend every returned line with the previous line, just as
| awk '{print p " " $0}{p=$0}'does - Write the result to a temporary file
- Call
git blamewith the-S tempfileoption
For each line you will see when a line was merged into the current branch.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information