How to start with Git

Setting up

Setting up a repo by cloning

git clone

Setting up a repo starting with a local

git init   # 1. create a local repo
git remote add origin https://.../repo.git   # 2. add a remote repo
git checkout origin/master # 3. checkout to remote repo

Pull - Get changes from remote repo

git pull

Stage / Unstage

git add . # Stage all
git add file.txt
git reset . # Unstage all staged
git reset --hard # Unstage and DELETES changes.

Push - Send changes to remote repo

git add *                # 1. add files to a local stage
git commit -m "message"  # 2. commit staged files to the local repo
git push                 # 3. push local to remote repo


Stash is for saving stuff that is not ready yet, but you dont want to commit it.

git stash     # Saving current changes and revert back to a clean working directory
git stash pop # Getting your stuff back


git branch  # Get branches info
git checkout my_existing_branch # Just load the branch into working directory
git checkout -b my_new_branch # Create new branch

Merge conflict with unrelated histories

Ein bestehendes lokales Git-Repo soll mit einem Remote-Repo gemerged werden:

Commit local repo:

git add *
git commit -m "message"

Checkout to remote-repo:

git checkout master
git merge localmaster --allow-unrelated-histories
git add *
git commit -m "resolved merge conflict"

Checkout a new branch, then merge

git checkout -b experiment
git add *
git commit -m "message"
git checkout master
git merge experiment

Last changes of a file

git log --oneline


$ git log --oneline
88740d8 (HEAD -> main, origin/main) resolved merge conflict
2d63319 (mylocalbranch) some changes
6a1816c initial commit

Untrack files

git rm --cached <file>
git rm -r --cached <folder>

git add .
git commit -m ".gitignore fix"
git push

Reset to a commit-hash

Carefull, all commits after this commit-hash will be gone.

git reset --hard <commit-hash>
git push -f origin master
Geschrieben von Aurelian Hermand
Erstellt am 2020-10-21