Nice to have notes

[d-p]

Hello Emanuele,

here are few patches that in my opinion can improve your example
without adding too much complexity.

Feel free to merge, cherry-pick or take inspiration from them.

Thanks again for your presentation.

Best,
Daniele

[emanuele]

Hi Daniele,
I like your additions but I guess they are too much for the exercise. Consider that this material is meant for very beginners. Did you consider moving your additions to the demo files instead? Colors in console are nice to show during demos. I don't expect newbies to remember color.ui during the exercise. Moreover it is not covered by the slides.
I have a slightly different opinion on custom git log output and mergetool. The first one is related to personal taste and for this reason I am relying on the default version provided by git. Anyway I like the customisation you propose. But the "--graph" would be more meaningful in the second demo, especially when master and orgin/master are not in sync. In the single_local demo, there is no need for "--graph" so adding it would puzzle the audience.
About the mergetool, is there one you suggest more than others? I tend not to use any of them, but I admit I have little experience with them.