@@ -63,33 +63,31 @@ and summarized under [Releases].
63
63
[ Releases ] : https://github.com/makenew/coffeescript-package/releases
64
64
[ The Unlicense ] : http://unlicense.org/UNLICENSE
65
65
66
- #### Add future update support
66
+ ### Updating
67
67
68
- If you want to merge in future updates from this skeleton and have your own origin ,
69
- set up a separate branch to track this.
68
+ If you want to pull in future updates from this skeleton,
69
+ you can fetch and merge in changes from this repository .
70
70
71
- ``` bash
71
+ If this repository is already set as ` origin ` ,
72
+ rename it to ` upstream ` with
73
+
74
+ ```
72
75
$ git remote rename origin upstream
73
- $ git branch coffeescript-package
74
- $ git branch -u upstream/master coffeescript-package
75
76
```
76
77
77
- Then add an origin and push master
78
+ and then configure your ` origin ` branch as normal.
78
79
79
- ``` bash
80
- $ git remote add origin
[email protected] :your_username/your-package.git
81
- $ git push -u origin master
82
- ```
80
+ Otherwise, add this as a new remote with
83
81
84
- Now, the ` coffeescript-package ` branch will pull changes from this project,
85
- which you can then merge into your other branches.
82
+ ```
83
+ $ git remote add upstream https://github.com/makenew/coffeescript-package.git
84
+ ```
86
85
87
- If you later clone your repo you will need to create the update branch again.
86
+ You can then fetch and merge changes with
88
87
89
- ``` bash
90
- $ git remote add upstream https://github.com/makenew/coffeescript-package.git
88
+ ```
91
89
$ git fetch upstream
92
- $ git checkout -b coffeescript-package upstream/master
90
+ $ git merge upstream/master
93
91
```
94
92
95
93
## Installation
0 commit comments