Changes between Version 76 and Version 77 of WorkingWithGit

Timestamp:

Feb 6, 2017, 9:49:36 PM (7 years ago)

Author:

mkae (Marko Käning)

Comment:

rework "Working with someone else' PR" section according to Rainer's feedback on dev-ML

WorkingWithGit

@@ -248 +248 @@
 This section describes how to work on a PR without the need to clone or pull from the PR author's repository. 
 
-Check out - according to [https://help.github.com/articles/checking-out-pull-requests-locally/ GitHub's help] - the pull request {{{#ID}}} to work on as a local branch {{{BRANCHNAME}}}:
-{{{
-git fetch origin pull/ID/head:BRANCHNAME
+Check out - according to [https://help.github.com/articles/checking-out-pull-requests-locally/ GitHub's help] - the pull request {{{#ID}}} to work on as a local branch:{{{BRANCHNAME}}}:
+{{{
+git fetch upstream pull/ID/head:BRANCHNAME
 git checkout BRANCHNAME
 }}}
-then work an it as needed, commit and finally decide where to push the changes made, e.g. by
-{{{
-git fetch upstream master
-git checkout master
-git merge BRANCHNAME
+alternatively you may use
+{{{
+curl -sLS https://github.com/macports/macports-ports/pull/<ID>.patch \
+ | git am
+}}}
+then pull in changes from upstream, work on it (if required), commit and push to e.g. {{{upstream}}} (i.e. in case the work is ready for production):
+{{{
+# --rebase option only needed if branch.autosetuprebase not set accordingly
+git pull --rebase upstream master
+
+# in case multiple commits have to be edited use
+git rebase -i
+
+# if missing append "Closes: #ID" to last commit message so that GitHub's PR gets auto-closed
+git commit --amend
+
 git push upstream master
 }}}
-