Changes between Version 64 and Version 65 of HowToGit

Timestamp:

07/03/19 08:18:50 (5 years ago)

Author:

neteler

Comment:

--

HowToGit

@@ -213 +213 @@
 
 {{{
+# temporarily switch to master
 git checkout master
-# With git log, identify the sha1sum of the commit you want to backport (example: into releasebranch_7_6)
+
+# update master to fetch the commit to be backported
+git fetch --all --prune 
+
+# Note: only needed if you have your fork as "origin" (see above)
+# update local repo 
+## NO git pull origin releasebranch_7_6 --rebase
+# merge updates into local master
+git merge upstream/releasebranch_7_6
+# at this point we have reached:
+# (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)
+
+# ??? update own remote
+git push origin releasebranch_7_6
+
+# ??? With git log, identify the sha1sum of the commit you want to backport (example: backport into releasebranch_7_6)
 git log
-
-# update to fetch the commit to be backported
-git fetch --all --prune 
 
 # switch to branch
 git checkout releasebranch_7_6
 
-# Note: only needed if you have your fork as "origin"
-# update local repo 
-git pull origin releasebranch_7_6 --rebase
-
 # now backport the commit (edit conflicts if needed)
 git cherry-pick the_sha1_sum