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

Best Documentation of a Free Software Package

One oft overlooked artifact in software development is the documentation. An API that is not well documented is no API at all when time is of the essence. That's why I think it is important to discuss some of the tools I have used and their documentation. AutoIt - I love how you simply press F1 within the AutoIt editor and boom, the reference to the particular syntax or function pops up in the help window. This help file is well written, self-contained, and chock full of examples that can be opened up in the editor right from the help, a fantastic symbiotic relationship. After installing AutoIt and giving it a try using their examples, I was able to create client/server scripts, GUI scripts, and window management scripts in no time. Overall, AutoIt is tops in this competition. A+ MySQL - At the bottom of each page of documentation that discusses a particular statement, users are able to post comments containing code snippets for that particular statement. This is great..

Fun with MySQL + PHP

Lately, I've been getting a lot of requests to build websites driven by lots of data, so I've been reading heavily into MySQL and PHP. I've been relying "Beginning PHP and MySQL: From Novice to Professional, Third Edition" by W. Jason Gilmore. I was concerned with his use of connecting to MySQL with a plaintext user name and password, so I went through a few tutorials online: [hvassing.com] [studiolounge.net] and the SQL reference manual: [dev.mysql.com] Of course, they did the same thing. I'm working on trying to implement an SSL solution to login, but unfortunately I think it'll require an X.509 certificate.