For another personal project (that I can’t talk about for the moment ;-)), I wanted to have a Changelog file to get a better following of the infrastructure evolution (configuration management, scripts…all under git). Of course the documentation is very important, but when you do not write it at the same time you’re building the infrastructure, it may be complex to remember each little things you’ve done. That’s why a Changelog can help to understand how the infrastructure has been built step by step.

Continue reading

A lot of time, I had to modify the text of my commit since I’m using a versionning system. Modifying the last commit comment is something common: git commit --amend However, modifying the date is not so common. You may want to do it for several reasons (stats or similar), here is how to: GIT_COMMITTER_DATE="`date`" git commit --amend --date "`date`" This will change the last commit with the current date.

Continue reading

Merging from one branch to another branch is something common with Git. I had to do it several times and recently I had to make a big one. I’ve just never took the time to look at what exist to make faster merge and how to use it. After some researches, I found git mergetool which will use VIM (by default on my laptop) to have a better view on what I have to do, to merge my files.

Continue reading