Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 7ff27bd

Browse files
committed
Add Updating section to README
1 parent 68d74c1 commit 7ff27bd

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

README.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,33 +63,31 @@ and summarized under [Releases].
6363
[Releases]: https://github.com/makenew/coffeescript-package/releases
6464
[The Unlicense]: http://unlicense.org/UNLICENSE
6565

66-
#### Add future update support
66+
### Updating
6767

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.
7070

71-
```bash
71+
If this repository is already set as `origin`,
72+
rename it to `upstream` with
73+
74+
```
7275
$ git remote rename origin upstream
73-
$ git branch coffeescript-package
74-
$ git branch -u upstream/master coffeescript-package
7576
```
7677

77-
Then add an origin and push master
78+
and then configure your `origin` branch as normal.
7879

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
8381

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+
```
8685

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
8887

89-
```bash
90-
$ git remote add upstream https://github.com/makenew/coffeescript-package.git
88+
```
9189
$ git fetch upstream
92-
$ git checkout -b coffeescript-package upstream/master
90+
$ git merge upstream/master
9391
```
9492

9593
## Installation

0 commit comments

Comments
 (0)