This shows you the differences between two versions of the page.
kurs:git [2012/01/10 11:10] mh |
kurs:git [2014/09/10 21:22] |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | ==== initialer checkout = clone ==== | ||
- | git clone git@github.com:MarkHofstetter/zend-hr-employees.git | ||
- | |||
- | |||
- | ==== Bestimmes file aus einer bestimmten revision auschecken ==== | ||
- | |||
- | git checkout abcde file/to/restore | ||
- | |||
- | ==== Alle - auch remote - branches anzeigen (geht logischerweise erst nach einem pull) ===== | ||
- | |||
- | ''> git branch -a'' | ||
- | |||
- | danach lokalen tracking branch erstellen | ||
- | |||
- | ''> git checkout -b develop remotes/origin/develop'' | ||
- | |||
- | topic branch abzweigen (branchen) | ||
- | |||
- | ''> git checkout -b topic --track develop'' | ||
- | |||
- | gegebenenfalls ins repo schieben | ||
- | |||
- | ''> git push origin topic'' | ||
- | |||
- | Entwickeln & testen ggf mehrere commits und pushes auf das repo | ||
- | |||
- | wenn fertig | ||
- | |||
- | ''> git checkout develop'' | ||
- | |||
- | ''> git merge --no-ff topic'' | ||
- | |||
- | ''> git push'' | ||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||
- | |||