Create a gist now

Instantly share code, notes, and snippets.

Embed
git commandline cheat-sheet

git cheat-sheet

The git command-line utility has plenty of inconsistencies http://steveko.wordpress.com/2012/02/24/10-things-i-hate-about-git/

A GUI like http://sourcetreeapp.com is often helpful, but staying on the command line usually quicker. This is a list of the commands I use most frequently, listed by funcional category:

current state

git status list which (unstaged) files have changed
git diff list (unstaged) changes to files
git log list recent commits

adding files to repo

git add fn stage file
git commit -m 'message' commit file
git commit -am 'message' add/commit all changes from all tracked files (no untracked files) in one go

undoing previous actions

http://git-scm.com/book/en/Git-Tools-Rewriting-History
git reset filename unstage file
git commit --amend -m 'message' alter the last commit (add any staged files, new comment)
git reset --soft HEAD^ undo previous commit, put changes in staging
git reset --hard HEAD^ Undo last commit and all changes
git reset --hard HEAD^^ Undo two (^^) last commits and all changes
git checkout -- cats.html index.html Undo all changes that were made to files cats.html and index.html
git rebase --onto <commit-id>\^ <commit-id> HEAD remove specific commit from repository. the \ in ^ is just an escape char to make zsh play nice and is not necessary if using bash.

remote repositories

git remote add origin git@example.com:example/petshop.git add a remote repository
git push -u origin master push current local repo to remote. -u sets it to default for the future
git remote -v show show the available remote repositories that have been added
git pull checkout and merge remote changes in one go
git fetch origin update the local cache of the remote repository
git remote -v update bring remote refs up to date (and -v show which branches were updated)
git status -uno will tell you whether the branch you are tracking is ahead, behind or has diverged. If it says nothing, the local and remote are the same.
git show-branch *master will show you the commits in all of the branches whose names end in master (eg master and origin/master).
git show remote origin show local<->remote branch tracking and sync status

Examine changes on remote, without pulling them

git fetch origin
git log HEAD..origin/master --oneline shows commit messages
git diff HEAD..origin/master shows all changes on remote compared to local HEAD

Branches

git branch list currently existing branches
git branch [branchname] create new branch
git checkout branchname move to that branch
git checkout -b branchname create and checkout new branch in one go
git branch -d branchname remove branch

merging branch back to master

git checkout master; git merge branchname; conditions for fast-forward merge - nothing new on master between branch start/end points

branches on remote

git fetch origin``git branch -r list remote branches (after a fetch)
git push origin :branchname delete remote branch 'branchname'
git remote prune origin clean up deleted remote branches (let's say someone else deleted a branch on the remote)
git show remote origin show local<->remote branch tracking and sync status (duplicate info under "remote repositories")

push local branch to differently named remote branch. Eg Heroku only deploys master

git push heroku yourbranch:master simple form
git push heroku-staging staging:master (localBranchName:remoteBranchName)

tagging

git tag list all tags
git checkout v0.0.1 checkout code
git tag -a v0.0.3 -m 'Version 0.0.3' add new tag
git push --tags push new tags to remote

dealing with large files - keep them outside the repo on an ssh machine.

http://stackoverflow.com/questions/540535/managing-large-binary-files-with-git
http://git-annex.branchable.com/walkthrough/ #see ssh section

git annex add mybigfile
git commit -m 'add mybigfile'
git push myremote git annex copy --to myremote mybigfile this command copies the actual content to myremote
git annex drop mybigfile remove content from local repo
git annex get mybigfile retrieve the content
git annex copy --from myremote mybigfilespecify the remote from which to get the file

@Attete

This comment has been minimized.

Show comment
Hide comment
@Attete

Attete Sep 14, 2017

This is very useful. Just the thing I needed. Thank you πŸ‘

Attete commented Sep 14, 2017

This is very useful. Just the thing I needed. Thank you πŸ‘

@LuisJLopez

This comment has been minimized.

Show comment
Hide comment

πŸ‘

@ufcolemanlab

This comment has been minimized.

Show comment
Hide comment
@ufcolemanlab

ufcolemanlab Oct 21, 2017

perfect, thanks!

perfect, thanks!

@KOUISAmine

This comment has been minimized.

Show comment
Hide comment
@KOUISAmine

KOUISAmine Oct 30, 2017

Thank you so much πŸ‘ finally i found what i look for.

Thank you so much πŸ‘ finally i found what i look for.

@marcodulog

This comment has been minimized.

Show comment
Hide comment

Thank you!

@anand007pandey

This comment has been minimized.

Show comment
Hide comment

Thanks

@dk574

This comment has been minimized.

Show comment
Hide comment
@dk574

dk574 Nov 26, 2017

Thank you

dk574 commented Nov 26, 2017

Thank you

@inphomercial

This comment has been minimized.

Show comment
Hide comment
@inphomercial

inphomercial Nov 27, 2017

I think this line:

git show remote origin

Needs to be changed to:

git remote show origin

I think this line:

git show remote origin

Needs to be changed to:

git remote show origin

@rickp2006

This comment has been minimized.

Show comment
Hide comment
@rickp2006

rickp2006 Dec 5, 2017

Thanks inphomercial, that was the one command I wanted to use but couldn't.

Thanks inphomercial, that was the one command I wanted to use but couldn't.

@DarwinniwraD

This comment has been minimized.

Show comment
Hide comment

πŸ‘

@ibrowne

This comment has been minimized.

Show comment
Hide comment
@ibrowne

ibrowne Jan 11, 2018

As someone fairly new to using GitHub in the terminal, this is super helpful. But I'm wondering... what about all the Git stash commands? cf. https://git-scm.com/docs/git-stash

ibrowne commented Jan 11, 2018

As someone fairly new to using GitHub in the terminal, this is super helpful. But I'm wondering... what about all the Git stash commands? cf. https://git-scm.com/docs/git-stash

@manju-h

This comment has been minimized.

Show comment
Hide comment
@manju-h

manju-h Feb 13, 2018

Is there anyway i can find all the commited files using commit message

eg:
adding A.java B.java
git commit -m "somemessage to FIX bug "

adding B.java C.java
git commit -m "again doing commit to FIX some bug"


Is there anyway i can find (A ,B, C, D files) using key word "FIX" used in both commit messages

manju-h commented Feb 13, 2018

Is there anyway i can find all the commited files using commit message

eg:
adding A.java B.java
git commit -m "somemessage to FIX bug "

adding B.java C.java
git commit -m "again doing commit to FIX some bug"


Is there anyway i can find (A ,B, C, D files) using key word "FIX" used in both commit messages

@minhluc77

This comment has been minimized.

Show comment
Hide comment
@minhluc77

minhluc77 Feb 22, 2018

it is helpful. Thanks,

it is helpful. Thanks,

@sunilshah2711

This comment has been minimized.

Show comment
Hide comment
@sunilshah2711

sunilshah2711 Mar 4, 2018

It's awesome. Thanks :)

It's awesome. Thanks :)

@mhlangagc

This comment has been minimized.

Show comment
Hide comment
@mhlangagc

mhlangagc Apr 5, 2018

Needed and helpful. πŸ’―

Needed and helpful. πŸ’―

@arduino731

This comment has been minimized.

Show comment
Hide comment
@arduino731

arduino731 Jun 16, 2018

make my day! some of those I cant remember all of them but the list that you provide is helpful to remind every developer. πŸ’˜

make my day! some of those I cant remember all of them but the list that you provide is helpful to remind every developer. πŸ’˜

@grebulator

This comment has been minimized.

Show comment
Hide comment
@grebulator

grebulator Jun 16, 2018

This is exactly what I was looking for! Thanks

This is exactly what I was looking for! Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment