The most infuriating part about git's default behavior is that it's so ignorant about what actual reality users live in. For example: when merging or rebasing

The most infuriating part about git's default behavior is that it's so ignorant about what actual reality users live in. For example: when merging or rebasing it's really important to know what I did myself, vs what someone else did. Yet it has a really opaque left/right or mine/theirs representation which even switches meaning depending on the operation you are doing. This isn't even a fundamental diff/patch issue it's just that git shrugs and assumes you want to perform some abstract operation on a DAG of things rather than, you know, rebase your code onto that of your colleagues.