Git protip: easy templates for `.gitignore`
The .gitignore file is great! But it can be tedious to fill in. What if we could do it all in one go?
Git protips
Git is packed with a whole bunch of commands and options, and the range of possible uses is vast. Here are a few tips drawn from many years of expertise as users and trainers.
-
-
Git protip: speed up conflicts management with mergetool
Resolving conflicting files after a merge can be time consuming. Fortunately Git provides us with a tool to speed this up!
-
Git protip: automatically setup remote tracking on push
No more explicit branch tracking on push! Say hello to autoSetupRemote configuration!
-
Git protip: gently force push
Did you know that you could force the push without risking to erase your collegues work?
-
Git protip: autocorrect command typos
Do you make typos when writing your commands? Would you like Git to correct automatically?
-
Git protip: quickly rewrite an old commit message
What about an alias that would to the job for you?
-
Git protip: easily add missing changes to an old commit
You can quickly "update" an old commit thanks to "commit --fixup"
-
Git protip: track function changes with "log -L"
Use "git log -L" to track changes only within a code block, figure out who actually introduced a bug, etc.
-
Git protip: blame, please don’t!
Do you think "git blame" is a good idea? You’re wrong!
-
Git protip: fix last commit with "--amend"
You just screwed up your last commit and want to fix it? The "git commit --amend" command is your friend!
-
Git protip: a graphical log that rocks!
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.
-
Git protip: a nice and efficient diff in the console
See differences in files, line by line, without any visual pollution
-
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.