Benutzer-Werkzeuge
git
====== Unterschiede ====== Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
|
git [2016/10/25 18:35] 193.247.239.160 |
git [2020/07/03 23:17] (aktuell) jonas |
||
|---|---|---|---|
| Zeile 1: | Zeile 1: | ||
| ====== git ====== | ====== git ====== | ||
| + | === Reset: Move in time === | ||
| + | Aktueller Stand: HEAD | ||
| + | |||
| + | 1 Commit zurück: | ||
| + | <code bash> | ||
| + | git reset HEAD~1 | ||
| + | </code> | ||
| + | |||
| + | === Branches === | ||
| + | |||
| + | == Create a Branch == | ||
| + | <code bash> | ||
| + | git checkout -b my-branch-name | ||
| + | </code> | ||
| + | |||
| + | == Merge with master == | ||
| + | <code bash> | ||
| + | git checkout master # switched back to master | ||
| + | git checkout master # get back to master branch; changes are gone for now | ||
| + | git merge my-branch-name | ||
| + | </code> | ||
| + | |||
| + | == Push to origin == | ||
| + | <code bash> | ||
| + | git push origin my-branch-name # push the branch | ||
| + | git pull origin master # get new data from github | ||
| + | </code> | ||
| + | |||
| + | === Workflow === | ||
| + | * Create a branch | ||
| + | * When branch is done: Push it to remote (Github) | ||
| + | * Pull it from Remote to local dev environment | ||
| + | |||
| + | |||
| + | ==== old ==== | ||
| == Commit: == | == Commit: == | ||
| <code> | <code> | ||
| Zeile 7: | Zeile 42: | ||
| </code> | </code> | ||
| - | == Neue Dateien dazufügen: == | + | == Geänderte Dateien dazufügen: == |
| <code> | <code> | ||
| - | git add -A | + | git add . # all changed files |
| + | git add myfile # one specific file | ||
| </code> | </code> | ||
git.txt · Zuletzt geändert: 2020/07/03 23:17 von jonas
Seiten-Werkzeuge
Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht: CC Attribution-Noncommercial-Share Alike 3.0 Unported
