git

When it comes to using git, I've mostly just learned as I go, figuring out whatever it is that I might need as the situation arise. In doing so though, I sometimes gloss over details about how things really work under the hood, so it's nice to be able to learn a bit more by going through the tutorials/videos I mentioned before. In fact, I learned that one incorrect assumption I've made up until now is that I thought that git stored commits as deltas, i.e., storing only bits that have changed from…Read more …

This is mostly for my own benefit, but here are some git commands that I've found useful: simplified git log showing 1-line description of commits: git log --pretty=oneline simplified git log showing tree structure of git repo: git log --graph --simplify-by-decoration --pretty=format:'%d' --all for more complicated logs, use gitk --all deleting a local branch (in case you muck around with a branch too much and can't seem to get things to reset properly with ): git branch -d the_local_branch when doing this, make sure you're on another branch (i.e., you're not on the…Read more …

After reading a lot about git merge and git rebase, my takeaway is this: Use git rebase when: Working alone on a feature branch that isn't and won't be shared with anyone. Rebasing will keep your history cleaner. You're done working on a feature branch and about to integrate it into the main branch. Use rebase to sanitize your history and squash/rewrite history as needed before the 'big merge' onto the main branch. Use git merge when: Working alone on a feature branch and others may be work off of your branch. This…Read more …