How Core Git Developers Configure Git (blog.gitbutler.com)

Article summary

The article discusses various Git configuration settings that can improve the user experience, including settings for diff algorithms, branch sorting, and push behavior. The author suggests that some of these settings should be default, as they are widely used by core Git developers. The article also touches on the topic of the default branch name, which has been changed from 'master' to 'main' in recent versions of Git. The author provides a list of configuration settings that can be applied to improve the Git experience.

Main themes

• Git configuration
• Default branch name
• Diff algorithms
• Branch management
• Push behavior
• Git best practices

What commenters say

• The change in default branch name from 'master' to 'main' has caused breakage in some Git workflows and scripts.
• Some users find the new default branch name 'main' to be more inclusive, while others see it as unnecessary or even problematic.
• Using a GUI for Git can simplify the user experience, but may not provide the same level of control as the command line.
• The complexity of Git is not necessarily a problem with the tool itself, but rather a reflection of the complexity of revision management tasks.
• Some users prefer to use external tools, such as kdiff3, to resolve merge conflicts and manage diffs.
• The use of a global ignore file can be useful, but may also lead to clutter and inconsistencies across different projects and teams.
• The decision to include certain settings as defaults in Git should be based on technical considerations, rather than social or political factors.