Re:The Git history command deserves more attention
by klibertp on Tuesday July 14, 2026 @10:14AM
(#48907237)
I absolutely love the images on the landing page. "Inappropriate use of blame, push and pull to resolve a conflict" is pure genius. Even the name had a lot of thought put into it (didn't know about "Giraffe language" before). Beautiful! :)
[ Parent
| on HN ]
Re:The Git history command deserves more attention
by NateEag on Tuesday July 14, 2026 @07:53PM
(#48914485)
The documentation is truly a thing of beauty.
As someone who learned a lot from Non-Violent Communication, discovering mergiraf went something like
> ...oh, cool - I've wanted this for years, great that someone buckled down and wrote it.
>
> Why 'mergiraf,' though?
>
> [Sees NVC link on the site]
>
> ...OH. Conflict resolution through understanding. That's absolutely brilliant, at so many levels.