[lmi-commits] [lmi] master d604202 3/3: Add instructions for cherry-picking remote "pull requests"

[Greg Chicares]

branch: master
commit d60420219f8bcf4462627bb91b14171381d8ec67
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Add instructions for cherry-picking remote "pull requests"
    
    On the merits of cherry-picking vs. merging, see:
      http://lists.nongnu.org/archive/html/lmi/2017-11/msg00013.html
---
 gwc/develop1.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 4da6b74..947e4c7 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -50,6 +50,22 @@ cvs diff -U3 file0.cpp file1.cpp >/dev/clipboard
 
 git am --scissors /path/to/patch
 
+  # Apply a patch by merging from a remote: first, view all remotes...
+
+git remote -v
+
+  # ...and set up the remote if needed (one time only)...
+
+git remote add xanadu https://github.com/vadz/lmi.git
+
+  # ...then update the remote...
+
+git fetch xanadu
+
+  # ...and cherry-pick the "pull request":
+
+git cherry-pick ..xanadu/name_of_pull_request
+
   # Discard local changes to particular files
 
 git checkout -- ce_skin_name.cpp ce_skin_name.hpp