4 ms·
Doesn't `git blame --first-parent` work for that? From my quick tests, it seems like it shows the merge commit if you have such a structure (`--first-parent` al
by bennofs 10y ago
Doesn't `git blame --first-parent` work for that? From my quick tests, it seems like it shows the merge commit if you have such a structure (`--first-parent` also works for `git log` etc)
- juped 10y agoTotally does (though your maintainer has to care about first-parentage order, which they should, and which should be enforced by the software but isn't - see Junio's blogpost "fun with non-fast-forward", or "fun with --first-parent" for more basic info)
- gsylvie 10y agoAnd this: http://bit-booster.blogspot.ca/2016/02/no-foxtrots-allowed.html http://bit-booster.blogspot.ca/2016/02/no-foxtrots-allowed.h... (p.s. your old comment on "git branching models" that starts "Not another one. All good git workflows are different..." was hilarious/awesome - https://news.ycombinator.com/item?id=11193048. https://news.ycombinator.com/item?id=11193048.)
- juped 10y agoThanks. Git superstitions bug me a lot because it shouldn't have to be this way.
- sergiosgc 10y agoThanks! It does. Learning something everyday.