# Git

## Create

Create an existing repository

```bash
git clone ssh://user@domain.com/repo.git
```

Create a new local repository

```bash
git init
```

## Local changes

Changed files in your working directory

```bash
git status
```

Changes to tracked files

```bash
git diff
```

Add all current changes to the next commit

```bash
git add .
```

Add some changes in \<file> to the next commit

```bash
git add -p <file>
```

Commit all local changes in tracked files

```bash
git commit -a
```

Commit previously staged changes

```bash
git commit
```

Change the last commit

*Don‘t amend published commits!*

```bash
git commit --amend
```

## Commit history

Show all commits, starting with newest

```bash
git log
```

Show changes over time for a specific file

```bash
git log -p <file>
```

Who changed what and when in

```bash
git blame <file>
```

## Branchs and Tags

List all existing branches

```bash
dig branch -av
```

Switch HEAD branch

```bash
git checkout <branch>
```

Create a new branch based on your current HEAD

```bash
git branch <new-branch>
```

Create a new tracking branch based on a remote branch

```bash
git checkout --track <remote/branch>
```

Delete a local branch

```bash
git branch -d <branch>
```

Mark the current commit with a tag

```bash
git tag <tag-name>
```

## Update and Publish

List all currently configured remotes

```bash
git remote -v
```

Show information about a remote

```bash
git remote show <remote>
```

Add new remote repository, named \<remote>

```bash
git remote add <shortname> <url>
```

Download all changes from \<remote>, but don‘t integrate into HEAD

```bash
git fetch <remote>
```

Download changes and directly merge / integrate into HEAD

```bash
git pull <remote> <branch>
```

Publish local changes on a remote

```bash
git push <remote> <branch>
```

Delete a branch on the remote

```bash
git branch -dr <remote/branch>
```

Publish your tags

```bash
git push --tags
```

## Merge and Rebase

Merge \<branch> into your current HEAD

```bash
git merge <branch>
```

Rebase your current HEAD onto \<branch>

*Don‘t rebase published commits!*

```bash
git rebase <branch>
```

Abort a rebase

```bash
git rebase --abort
```

Continue a rebase after resolving conflicts

```bash
git rebase --continue
```

Use your configured merge tool to solve conflicts

```bash
git mergetool
```

Use your editor to manually solve conflicts and (after resolving) mark file as resolved

```bash
git add <resolved-file>
```

```bash
git rm <resolved-file>
```

## Undo

Discard all local changes in your working directory

```bash
git reset --hard HEAD
```

Discard local changes in a specific file

```bash
git checkout HEAD <file>
```

Revert a commit

*by producing a new commit with contrary changes*

```bash
git revert <commit>
```

Reset your HEAD pointer to a previous commit …and discard all changes since then

```bash
git reset --hard <commit>
```

... and preserve all changes as unstaged changes

```bash
git reset <commit>
```

... and preserve uncommitted local changes

```bash
git reset --keep <commit>
```

## Help and Documentation

```bash
git help <command>
```

## Useful links

* [Installing git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
* [Git refrence](https://git-scm.com/docs)
* [Git commands](https://git-scm.com/docs/git#_git_commands)
* [Git Tutorial (Youtube, Mosh)](https://www.youtube.com/watch?v=8JJ101D3knE)