Git Cheatpage

1. Installation
2. Configuration
3. Commands
4. Links

1. Installation

Install git
```
# apt-get install git-core
```

2. Configuration

2.1 Branch

Configure branch settings

$ git config --global branch.autosetupmerge true

2.2 Color

Configure color settings
```
$ git config --global color.ui auto
```

2.3 User

Configure user settings

$ git config --global user.email foo@example.com
$ git config --global user.name 'Foo Bar'
$ git config --global user.signingkey 12345678

3. Commands

3.1 Branches

List local branches:
```
$ git branch
```
List remote branches:
```
$ git branch -r
```
List all branches:
```
$ git branch -a
```
Create branch:
```
$ git branch mybranch
```
Switch branch:
```
$ git checkout mybranch
```
Remove branch:
```
$ git branch -d mybranch
```
Remove remote branch:
```
$ git push origin :mybranch
```

Setting default branch in bare repository:

$ git symbolic-ref HEAD refs/heads/mybranch

Removing particular file from history:

$ git filter-branch --tree-filter 'rm -f mydirectory/myfile' HEAD

$ git reflog expire --expire=0 --all

$ git prune

$ git repack -adf

Creating an empty branch without history (plumbing):

$ git symbolic-ref HEAD refs/heads/mybranch

$ rm .git/index

Commit new content

Creating an empty branch without history (porcelain):

$ mkdir ../mybranch
$ cd ../mybranch
$ git init

Commit new content

$ cd -
$ git fetch ../mybranch master:mybranch

^

3.1 Checkouts

Checkout master branch from a normal server:
$ git clone git://myserver/myrepository.git
or
$ git clone http://myserver/myrepository.git
or
$ git clone ssh://myserver/myrepository.git

Checkout master branch from a gitosis server:
$ git clone gitosis@myserver:myrepository.git

Checkout any branch other than master:
$ git clone git://myserver/myrepository.git $ git checkout -b mybranch origin/mybranch

Revert all modifications upto last commit on master branch:
$ git checkout -f master

Remove all untracked files and directories on current branch:
$ git clean -dxf

Update local checkout from origin server and merge updates:
$ git pull

^

3.2 Commits

Add signed commit (e.g. for initial imports):
$ git commit -s -m "My commit."

Add normal commit:
$ git commit -a -m "My commit."

Add commit of only specific files:
$ git commit -m "My commit." myfirstfile mysecondfile mythirdfile [...]

^

3.3 Files

Add a file or a directory (recursively):
$ git add myfile
or
$ git add mydirectory

Add all files and directories, recursively:
$ git add .

Remove a file or a directory (recursively):
$ git rm myfile
or
$ git rm mydirectory

Rename a file or a directory:
$ git mv myfile mynewfile
or
$ git mv mydirectory mynewdirectory

^

3.5 Merges

Merge upto specific commit (HASH) from other branch:
$ git merge HASH

Merge upto specific commit (HASH) from other branch and squash the commits:
$ git merge --squash HASH $ git commit -a -m "My squashed commit."

Redo specific commit (HASH) from other branch that would conflict:
$ git cherrypick HASH

^

3.6 Pushes

Push to master branch to server:
$ git push
which is the same as
$ git push origin master

Push branch other than master to server:
$ git push origin mybranch:refs/heads/mybranch

Push all branches to server:
$ git push --all

Push tags to server:
$ git push --tags

^

3.7 Remotes

List remote locations:
$ ls .git/refs/remotes/*

Show remote location:
$ git remote show mylocation

Add new remote location:
$ git remote add mylocation git://mylocation/myrepository.git

Remote existing remote location:
$ git remote rm mylocation

Get updates from remote location:
$ git remote update mylocation

^

3.8 Tags

Add signed tag (e.g. for initial tag):
$ git tag -s -m "My tag." mytag

Add normal tag of HEAD:
$ git tag -a -m "My tag." mytag

Add normal tag to HEAD, but use branch convention:
$ git tag -a -m "My tag." mybranch/mytag

Add normal tag of a specific commit (HASH) older than HEAD:
$ git tag -a -m "My tag." mytag HASH

List tags:
$ git tag

Rename tag:
$ git tag -m mytag mynewtag

Remove tag:
$ git tag -d mytag

Remove remote tag:
$ git push origin :refs/tags/mytag

^

4. Links

Tech Talk: Linus Torvalds on git

Tech Talk: Randal Schwartz on git

Git poster

^

-- Daniel Baumann <daniel@debian.org> Sun, 27 Jan 2008 10:47:00 +0100