Changes between Version 78 and Version 79 of HowToGit

Timestamp:

11/17/19 13:57:21 (5 years ago)

Author:

neteler

Comment:

G76 -> G78

HowToGit

@@ -63 +63 @@
 # (HEAD -> master, upstream/master)
 
-### b) updating releasebranch_7_6
+### b) updating releasebranch_7_8
 # switch to branch
 # only once
-git checkout -b releasebranch_7_6 origin/releasebranch_7_6
-# next time, git checkout releasebranch_7_6
+git checkout -b releasebranch_7_8 origin/releasebranch_7_8
+# next time, git checkout releasebranch_7_8
 
 # merge updates into local branch
-git merge upstream/releasebranch_7_6
+git merge upstream/releasebranch_7_8
 
 # at this point we have reached:
-# (HEAD -> releasebranch_7_6, upstream/releasebranch_7_6)
+# (HEAD -> releasebranch_7_8, upstream/releasebranch_7_8)
 
 # update own remote
@@ -252 +252 @@
 === Made a mess? Fix it ===
 
-Example: mess happened on releasebranch_7_6:
-
-{{{
-git reset --hard upstream/releasebranch_7_6 
-git pull upstream releasebranch_7_6 --rebase
+Example: mess happened on releasebranch_7_8:
+
+{{{
+git reset --hard upstream/releasebranch_7_8 
+git pull upstream releasebranch_7_8 --rebase
 
 # now all should be clean again