Changes between Version 47 and Version 48 of HowToGit

Timestamp:

05/26/19 06:36:32 (6 years ago)

Author:

neteler

Comment:

--

HowToGit

@@ -170 +170 @@
 git checkout master
 # With git log, identify the sha1sum of the commit you want to backport (example: into releasebranch_7_6)
+git log
 
 # switch to branch
 git checkout releasebranch_7_6
-# update
+
+# first update local repo 
 git pull origin releasebranch_7_6 --rebase
-# backport the commit
+
+# now backport the commit (edit conflicts if needed)
 git cherry-pick the_sha1_sum
-# push to upstream
+
+# push backport to upstream
 git push upstream releasebranch_7_6 
 }}}