The Git cookbook

Git, you either love it for its power or hate it for it's ui. While I'm a trained git apologist and love its power and flexibility, I've also done a lot of git user support at work and in the #git IRC channel. I understand the frustration of the jumble of jargon, inconsistency and arcana that is the git UI and will help you dive into it!

If you have questions, comments or suggestions about any of the articles, please leave a comment on the article or in the issue tracker on GitLab. Suggestions for new articles are also very welcome!


Git and configuration files

Posted on Wed 17 August 2016 in Effective git usage • Tagged with configurationLeave a comment

How do you keep local changes to the configuration files in your project's repository? Should you use update-index, or is there a better way to ignore local changes. None of that nonsense, your configuration files do not belong there and in this article I'll show you why, and what alternatives there are for your configuration files.

Continue reading