Tutorials, protips and other technical stuff 2023-04-10T00:00:00Z https://comprendre-git.com/en/ Maxime Bréhin 2023-04-10T00:00:00Z https://comprendre-git.com/en/protips/git-protip-gitignore-io/ The .gitignore file is great! But it can be tedious to fill in. What if we could do it all in one go? 2023-04-10T00:00:00Z https://comprendre-git.com/en/config/git-ignore/ How can we avoid adding unwanted files to Git? And reciprocally, how can we add otherwise ignored files? 2023-03-27T00:00:00Z https://comprendre-git.com/en/config/git-config-part-2/ Using Git optimally goes through tweaking its configuration! 2023-02-06T00:00:00Z https://comprendre-git.com/en/protips/git-mergetool/ Resolving conflicting files after a merge can be time consuming. Fortunately Git provides us with a tool to speed this up! 2023-01-30T00:00:00Z https://comprendre-git.com/en/protips/git-push-auto-setup-remote/ No more explicit branch tracking on push! Say hello to autoSetupRemote configuration! 2023-01-23T00:00:00Z https://comprendre-git.com/en/protips/git-push-with-lease/ Did you know that you could force the push without risking to erase your collegues work? 2022-12-12T00:00:00Z https://comprendre-git.com/en/protips/git-autocorrect/ Do you make typos when writing your commands? Would you like Git to correct automatically? 2022-10-17T00:00:00Z https://comprendre-git.com/en/protips/git-protip-autoreword/ What about an alias that would to the job for you? 2022-10-17T00:00:00Z https://comprendre-git.com/en/protips/git-protip-autofixup/ You can quickly "update" an old commit thanks to "commit --fixup" 2022-10-10T00:00:00Z https://comprendre-git.com/en/protips/git-protip-log-l/ Use "git log -L" to track changes only within a code block, figure out who actually introduced a bug, etc. 2022-10-10T00:00:00Z https://comprendre-git.com/en/protips/git-protip-dont-blame-me/ Do you think "git blame" is a good idea? You’re wrong! 2022-09-26T00:00:00Z https://comprendre-git.com/en/protips/git-protip-amend/ You just screwed up your last commit and want to fix it? The "git commit --amend" command is your friend! 2022-08-29T00:00:00Z https://comprendre-git.com/en/protips/git-protip-lg/ The classic Git log (for displaying the commit history) does not fit the standard use case. Rather than using a graphical interface, let’s use an alias and a custom log. 2022-08-28T00:00:00Z https://comprendre-git.com/en/protips/git-protip-diff-so-fancy/ See differences in files, line by line, without any visual pollution 2019-01-03T00:00:00Z https://comprendre-git.com/en/automation/git-hooks-commit/ Enhance your code and your commit messages with Git hooks. 2017-04-14T00:00:00Z https://comprendre-git.com/en/automation/git-hooks/ Improve quality and reduce stress with tasks automation. 2016-05-11T00:00:00Z https://comprendre-git.com/en/commands/git-reset/ The git reset command is a formidable tool unfortunately far too often misunderstood or poorly used. This is too bad, as it opens up a wide range of solutions and tips to optimize our work and workflows. 2015-01-30T00:00:00Z https://comprendre-git.com/en/commands/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. 2014-12-31T00:00:00Z https://comprendre-git.com/en/commands/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. 2014-12-09T00:00:00Z https://comprendre-git.com/en/commands/git-bisect/ 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? 2014-11-28T00:00:00Z https://comprendre-git.com/en/protips/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. 2014-11-04T00:00:00Z https://comprendre-git.com/en/protips/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. 2014-09-15T00:00:00Z https://comprendre-git.com/en/protips/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. 2014-08-28T00:00:00Z https://comprendre-git.com/en/archives/whats-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. 2014-05-04T00:00:00Z https://comprendre-git.com/en/commands/getting-solid-at-git-rebase-vs-merge/ Each one is best for specific purposes, so learn when to use them efficiently, and why. 2013-04-03T00:00:00Z https://comprendre-git.com/en/archives/git-configuration/ Detailed overview of must-have settings for efficiently using Git everyday. A must-read.