Changes between Version 67 and Version 68 of HowToGit

Timestamp:

Aug 6, 2019, 11:45:55 AM (5 years ago)

Author:

neteler

Comment:

simplified method by martinl (​https://lists.osgeo.org/pipermail/grass-dev/2019-July/092936.html)

HowToGit

@@ -224 +224 @@
 }}}
 
-=== Backporting of a single commit ===
-
-{{{
-# temporarily switch to master
-git checkout master
-
-# update master to fetch the commit to be backported
-git fetch --all --prune 
-
-# ??? With git log, identify the sha1sum of the commit you want to backport (example: backport into releasebranch_7_6)
-git log
-
-# Note: only needed if you have your fork as "origin" (see above)
-# update local repo 
-## NO git pull origin releasebranch_7_6 --rebase
-
-# switch to branch
-git checkout releasebranch_7_6
-
-# merge updates into local releasebranch_7_6
-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
-
-# now backport the commit (edit conflicts if needed)
-git cherry-pick the_sha1_sum
+=== Backporting of a single commit from master to release branch ===
+
+... assumming that we are in releasebranch_7_8 branch:
+
+{{{
+git fetch --all --prune
+git rebase upstream/releasebranch_7_8
+# get hash from GitHub or git log in master
+git cherry-pick <hash>
+
+#(or
+#git cherry-pick -m1 hash
+#when cherry picking a merge request)
 
 # verify
@@ -259 +242 @@
 
 # push backport to upstream
-git push upstream releasebranch_7_6 
-}}}
-
-See also https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md#backporting-bugfixes-from-master-to-a-stable-branch
-
+git push upstream releasebranch_7_8
+}}}
 === Backporting of a merged pull request from master ===