Git Cheat Sheet

Table of Contents

Useful Cheat Sheets on the Web

Get rid of “push” warning

Getting rid of this warning:

warning: You did not specify any refspecs to push, and the current remote
warning: has not configured any push refspecs. The default action in this
warning: case is to push all matching refspecs, that is, all branches
warning: that exist both locally and remotely will be updated.  This may
warning: not necessarily be what you want to happen.
warning: 
warning: You can specify what action you want to take in this case, and
warning: avoid seeing this message again, by configuring 'push.default' to:
warning:   'nothing'  : Do not push anything
warning:   'matching' : Push all matching branches (default)
warning:   'tracking' : Push the current branch to whatever it is tracking
warning:   'current'  : Push the current branch


$ git config push.default matching
$ git config --global push.default matching

See http://pivotallabs.com/users/alex/blog/articles/883-git-config-push-default-matching

Sync local repo with remote branches

Someone has created a new, remote branch. To get your local repo to see the branch, so you can do a git checkout:

$ git fetch
$ git checkout newbranch

Create a remote branch

Create a local branch, then push it to the server. General syntax:

$ git push REMOTE LOCALBRANCH:REMOTEBRANCH

The remote branch name can be omitted if it’s the same name as the local branch.

$ git co -b mybranch
$ git push origin mybranch

Delete a remote branch

$ git push remotename :branch

e.g.:

$ git push origin :testbranch

You are literally telling git “push nothing into BRANCHNAME on REMOTENAME”.

Create a bare repository

New:

$ mkdir foo.git && cd foo.git
$ git --bare init

From an existing repo:

$ git clone --bare /path/to/existing/repo proj.git

Mark conflict resolved

$ git add file

Rename a tag

From http://stackoverflow.com/questions/1028649/rename-a-tag-in-git:

git tag new old
git tag -d old
git push origin :refs/tags/old
git push --tags

Diff two versions of the same file

git diff hash1..hash2 -- path/to/file

Determine which branch contains a change

$ git branch --contains 2039f3

Display which files were in a commit:

$ git diff-tree --no-commit-id --name-only -r bd61ad98 # method 1
$ git show --pretty="format:" --name-only bd61ad98     # method 2

If you do this a lot, consider creating an alias by adding an entry to the [alias] section of your $HOME/.gitconfig file:

[alias]
files = diff-tree --no-commit-id --name-only -r

Once you’ve saved the alias, you can simply type:

$ git files bd61ad98

to see the files in a particular commit.

Show an old version of a file

http://stackoverflow.com/questions/338436/is-there-a-quick-git-command-to-see-an-old-version-of-a-file

General form:

$ git show REVISION:path/to/file

Example:

$ git show HEAD~4:src/main.c

Sync a forked repo

See https://help.github.com/articles/syncing-a-fork/. In short:

git remote add forked {url-to-original-repo}
git fetch forked
git checkout master
git merge forked/master
git push origin master
Generated by Jekyll.