public
Fork of defunkt/github-gem
Description: The official `github` command line helper for simplifying your GitHub experience.
Homepage: http://github.com
Clone URL: git://github.com/halorgium/github-gem.git
Improved docs on how to pull changes
rmm5t (author)
Mon Mar 03 21:22:59 -0800 2008
commit  173746866f75116a94abaad4dae677cb4907824a
tree    62c2722306b9d573ea6ac99c571fd0fff6122d81
parent  3b0eb651d9498377e24f269dc270097d11e2b043
0
...
29
30
31
32
33
 
 
 
 
 
34
 
 
 
35
36
37
...
29
30
31
 
 
32
33
34
35
36
37
38
39
40
41
42
43
0
@@ -29,9 +29,15 @@ Let's say you just forked `github-gem` on GitHub from defunkt.
0
 This will setup a remote and branch for defunkt's repository at master.
0
 In this case, a 'defunkt/master' branch.
0
 
0
-If defunkt makes some changes you want, simply `github pull defunkt` then
0
-`git merge defunkt/master`
0
+If defunkt makes some changes you want, simply `github pull defunkt`. This will
0
+leave you in the 'defunkt/master' branch after pulling changes from defunkt's
0
+remote. After confirming that defunkt's changes were what you wanted, run `git
0
+checkout master` and then `git merge defunkt/master` to merge defunkt's changes
0
+into your own master branch. In summary:
0
 
0
+ $ github pull defunkt
0
+ $ git checkout master
0
+ $ git merge defunkt/master
0
 
0
 
0
 ==========

Comments

    No one has commented yet.