Skip to main content

The TL;DR guide to git

While in the past I've held a pretty high opinion to using mercurial for version control, the majority of version control these days seems to done in git.  Here were the commands I found most useful to get productive with git right away.

# Clone a repository from an origin, i.e. my github MaskingUtils repository

git clone git@github.com:caelumvox/masking-utils.git

# Add a file after it's been updated to stage it for commit, or add a new file

git add filename

# Commit the file to local repo

git commit

# Push the file to the origin so the rest of the team can see it

git push

# List all locally tracked branches

git branch
git branch --list

# Get a list of all branches from the remote

git branch -r

# Create branch locally

git branch develop

# Push the branch to the origin repository to make sure it is tracked there

git push --set-upstream origin develop

# Pulls latest from all local branches tracked from origin; won't pull non-tracked branches

git pull --all

# Fetch the branch list, remove any '->' entries, and then track them locally
git branch -r | grep -v '\->' | while read remote; do git branch --track "${remote#origin/}" "$remote"; done

# Revert all local changes

git checkout -- .
git reset --hard

# Deleted latest commit at head on a branch, and then pushing that delete
git reset --hard HEAD~1
git push origin HEAD --force

# Create a tag
git tag 2.0.5-RC1

# Push the tag
git push origin 2.0.5-RC1

# Cherry pick certain items from one branch and committed to another
# 1. check out target branch
# 2. cherry pick by selecting commit IDs from the source.  The IDs can be partial, like the first part.
#
# The challenge is that this is prone to some strange conflicts.
#
# Example:
git cherry-pick ac2bdbdf

# git move tag
git tag -f tag

# git checkout to a revision using its hash

git checkout 658185132b81702da6bfe68d6bcdba568d8b378f

# git checkout to head, just checkout to branch name
git checkout master

# Getting number of commits by author excluding merges
git log --no-merges --since=2020-03-31 | grep "Author:" | sort | uniq -c

Comments

Popular posts from this blog

Software Design Principles - SOLID

The SOLID software design principles weren't called SOLID while I was in grad school, but the concepts were there in my Object Oriented Design course. They're worth mentioning here, primarily because I think once you start coding and become dangerous, it's one of the best ways to stay organized once you incorporate it into your daily coding routines, and it even changes your way of thinking for the better: https://en.wikipedia.org/wiki/SOLID

Matlab and MySQL

I had a lot of data in a MySQL database that I wanted to analyze. I had a copy of Matlab, so I figured the best way to look at this all would be to plot this data and use some GUI elements to go through various combinations. After some Googling, I found this database connector that seemed to do the trick. I downloaded the files, configured mex to use MSVC 2008, built the connector, then I was able to successfully connect over the network! I ran into two problems, though: The connector does not support fetching columns of type TIMESTAMP, and With the magnitude of data (about 180k rows), access times were really slow. I was able to solve problem #1 by changing my columns to DATETIME, which was supported. I'm still trying to figure out problem #2. It may come down to importing all the data directly into Matlab.

Rehashing C++ With Smart Pointers

Though I have seldom cared about using smart pointers these past three years (primarily because I work mostly with C, which can't support truly encapsulating smart pointers), I have tried to rehash my knowledge with Andrei Alexandrescu's tutorial here: [informit.com] I am absolutely astounded by the attention to detail in this article for something so simple as a single class with overloaded operators. C++ is a language that is not for the faint at heart, so this sort of article helps to navigate through the memory management limitations of C++. I should consider buying Andrei's book with the Eckel book to go with my Stroustroup and Musser books! Where's my amazon wish list...