For managing my photo (and video) collection, which is too large to fit on my laptop drive, I use Git Annex. It's a nerdy solution (a fair amount of git knowledge is required), but I like that I can sync a whole tree of files between multiple devices/backends ...
A colleague of mine at work has set up his IDE to clean up all trailing whitespace on save. Nothing wrong with that, except that he is the only one, which very often means in practice that his commits are sprinkled with fixes of other people's whitespace mixups. Because ...
In git, when you do
git stash popof unfinished code after upstream merges, you might get a conflict between the stash and the upstream changes you pulled in.
You git clone now has "unmerged paths" aka is in conflict state. For example,
# Unmerged paths: # (use "git ...
Git comes with a massive bunch of (sub)commands and even if you're dealing with git on a daily basis, you might not always remember every single one you need along the way. Having bash completion for git is already a good start (type
git, a space and then ...
I'm experimenting with using a Subversion repository through Git. That way I can keep better track of my own (experimental) work, without polluting/destabilizing the central Subversion repository with small incremental commits. Git comes with a
svnsub-tool that takes care of all the interfacing between the local git ...