20 years.
A look back on Christophe’s 20 years so far of professional IT career.
Articles and tutorials
You’re looking for good practices, tech novelties that we like or how to use efficiently some tools? You’re at the right place!
You can’t find the subject you’re looking for? Let us know, we’ll be happy to help!
(Also if you read French, we have a lot more content.)
-
-
Mastering Git subtrees
A month ago we were exploring Git submodules; I told you then our next in-depth article would be about subtrees, which are the main alternative.
-
Mastering Git submodules
If you used submodules before, you certainly got a few scars to show for it, probably swearing off the dang thing. Submodules are hair-pulling for sure, what with their host of pitfalls and traps lurking around most use cases. Still, they are not without merits, if you know how to handle them.
-
Git Bisect: quickly zero in on a bug’s origin
Oooh, what a nasty bug you just noticed! Alas, you can’t seem to find out where it originates just now, and it appears to have been around for a while, too… How can you avoid combing through the entire history?
-
How to make Git preserve specific files while merging
Oh boy, are branches great. They let you have entirely different versions of a given file, depending on the context. The thing is, in a few (not so rare) situations, you may want to version a file that changes from branch to branch, but retain its current content when merging another branch into yours.
-
Fix conflicts only once with git rerere
So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one (perhaps you did another merge, or ended up rebasing instead, or cherry-picked the faulty commit elsewhere…). And bang, you had to fix that same conflict again. That sucks.
-
30 Git CLI options you should know about
You think you know Git? Maybe you do… And yet, I’d bet my shirt that many cool little command-line options remain unknown to you.
-
What’s new since Git 1.7
A lot of people use Git without quite tracking what’s coming up in later releases. Sometimes you just go with whatever’s available on your Linux distro, even if that is quite outdated.
-
Getting solid at Git rebase vs. merge
Each one is best for specific purposes, so learn when to use them efficiently, and why.
-
A well-honed Git configuration
Detailed overview of must-have settings for efficiently using Git everyday. A must-read.