Building Resilient Systems on AWS: Learn how to design and implement a resilient, highly available, fault-tolerant infrastructure on AWS.

Useful Git Commands

By David Walsh on February 15, 2012

I've used git quite a bit but I don't consider myself a git expert, per se. I often find myself looking up the same basic commands so I thought I'd share them there so I'd have a fast reference, and maybe this will help you out too!

Create and Checkout a New Branch

#branches from currently checked out directory
git checkout -b <branchName>

Checkout a Remote Branch

git checkout -b <localBranchName> origin/<remoteBranchName>

Abort Changes of a File

git checkout -- <fileName>

Modify the Previous Commit's Message

git commit --amend

Partial Change Checkin

git add --edit

Undo the Previous Commit

git revert HEAD^

Temporarily Stash Changes, Restore Later

# After changes have been made...
git stash

# Do some other stuff here, like switch branches, merge other changes, etc.

#Re-apply the changes
git stash pop

Delete a Remote Branch

git push origin :<branchName>

Pull in the Latest from a Shared Repository

# Add a remote branch
git remote add <remoteName> <gitAddress>
	# For example:  git remote add lightfaceOfficial git://github.com/darkwing/LightFace.git

# Get changes from that branch
git fetch <remoteName>

Tagging, Deleting, and Pushing Tags

# Create a Tag
git tag <tagName>

# Delete the tag
git tag -d <tagName>

# Push Tags
git push --tags

Who F'd it All Up?

git blame <fileName>

These basic git commands should help you on your way. Have a tip you'd like to share with others? Please share!

Recent Features

By David WalshFebruary 18, 2013
Create a Sheen Logo Effect with CSS
I was inspired when I first saw Addy Osmani's original ShineTime blog post. The hover sheen effect is simple but awesome. When I started my blog redesign, I really wanted to use a sheen effect with my logo. Using two HTML elements and...
By David WalshDecember 10, 2012
How to Create a Twitter Card
One of my favorite social APIs was the Open Graph API adopted by Facebook. Adding just a few META tags to each page allowed links to my article to be styled and presented the way I wanted them to, giving me a bit of control...

Incredible Demos

By David WalshJune 10, 2008
MooTools Gone Wild: Element Flashing
If you're like me and lay awake in bed at night, you've flipped on the TV and seen the commercials: misguided, attention-starved college girls fueled by alcohol ruining their futures by flashing lame camera-men on Spring Break. Why do they do it? Attention...
By David WalshFebruary 2, 2010
Scrolling “Agree to Terms” Component with MooTools ScrollSpy
Remember the good old days of Windows applications forcing you to scroll down to the bottom of the "terms and conditions" pane, theoretically in an effort ensure that you actually read them? You're saying "No David, don't do it." Too late -- I've done...

Discussion

Jan Kassens
Fetch from all remote repositories:
git remote update

See a nice ascii graph of your branches:
git log --oneline --graph --all

Arlo Carreon
+1 on the ascii graph. I even make an alias for it.

git config --global alias.timeline "log --oneline --graph --decorate"

So all when i need my ascii graph I just:
git timeline

sanija

git remote update-git log --oneline --graph --all="git config --global alias.timeline "log --oneline --graph --decorate"{git timeline}

Arlo Carreon
+1 on the ascii graph. I even make an alias for it.

git config --global alias.timeline "log --oneline --graph --decorate"

So all when i need my ascii graph I just:

git timeline
Denis S.
check this out “git – the simple guide” by @rogerdudler
http://rogerdudler.github.com/git-guide/index.html
Harry
Hey, just to expand on “undo previous commit”:

git reset --hard HEAD~3

This will revert three commits back.
Okeowo Omololu Remi
tried adapting to command git not to used to it so i settled for SmartGit pending i grasped the whole Git command line thingy
Jan-Marten de Boer
Not sure why this works for you, but I really have to do this to stash:

$ git stash save “The name of the stash”

And then to put it back

$ git stash apply

Or

$ git stash apply “The name of the stash”
arjun
The below cmd is used for search:

grep log –grep=”your search word”
John W
The ASCII timeline (above) can be customised further, to good effect, by using the –format option, e.g. to add time information about the commits (helpful in a timeline!):

git log –graph –all –format=’%h %an %ad – %s’

(or use %ar instead of %ad if you like relative dates)

Mix with other options to suit. Full details of the format option are in the git-log man page (quite far down the page).