[GRASS-dev] how to backport in git(hub)?

[Helmut Kudrnovsky]

hi,

https://github.com/OSGeo/grass/pull/53

is labelled as backport needed.

in https://trac.osgeo.org/grass/wiki/HowToGit#Backportingofasinglecommit

---------
# temporarily switch to master
git checkout master

# 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

# switch to branch
git checkout releasebranch_7_6

# now backport the commit (edit conflicts if needed)
git cherry-pick the_sha1_sum

# verify
git show

# push backport to upstream
git push upstream releasebranch_7_6 
--------

are all these steps needed for backporting a single commit like pull/53?



-----
best regards
Helmut
--
Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html