JR's Wiki

====== 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: == <code> git commit -am "Beschreibung" git push </code> == Geänderte Dateien dazufügen: == <code> git add . # all changed files git add myfile # one specific file </code> == Update: == <code> git pull (?) </code> == Einfache Anleitung: == http://rogerdudler.github.io/git-guide/