Differences

This shows you the differences between two versions of the page.

--- kurs:git [2012/01/04 11:19]
mh
+++ kurs:git [2012/01/10 11:10]
mh
@@ Line 9: / Line 9: @@
 ==== Alle - auch remote - branches anzeigen (geht logischerweise erst nach einem pull) =====
-git branch -a
+''> git branch -a''
 danach lokalen tracking branch erstellen
-git checkout -b develop  remotes/origin/develop
+''> git checkout -b develop remotes/origin/develop''
 topic branch abzweigen (branchen)
-git branch topic
+''> git checkout -b topic --track develop''
-git checkout topic
 gegebenenfalls ins repo schieben
-git push origin topic
+''> 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''

dokuwiki