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

Commit 6d5147a

Browse files
committed
Update Updating section
1 parent 9a09c7c commit 6d5147a

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

README.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,33 +69,31 @@ and summarized under [Releases].
6969
[Releases]: https://github.com/makenew/sass-package/releases
7070
[The Unlicense]: http://unlicense.org/UNLICENSE
7171

72-
#### Add future update support
72+
### Updating
7373

74-
If you want to merge in future updates from this skeleton and have your own origin,
75-
set up a separate branch to track this.
74+
If you want to pull in future updates from this skeleton,
75+
you can fetch and merge in changes from this repository.
76+
77+
If this repository is already set as `origin`,
78+
rename it to `upstream` with
7679

7780
```
7881
$ git remote rename origin upstream
79-
$ git branch sass-package
80-
$ git branch -u upstream/libsass sass-package
8182
```
8283

83-
Then add an origin and push master
84+
and then configure your `origin` branch as normal.
85+
86+
Otherwise, add this as a new remote with
8487

8588
```
86-
$ git remote add origin [email protected]:your_username/your-package.git
87-
$ git push -u origin master
89+
$ git remote add upstream https://github.com/makenew/sass-package.git
8890
```
8991

90-
Now, the `sass-package` branch will pull changes from this project,
91-
which you can then merge into your other branches.
92-
93-
If you later clone your repo you will need to create the update branch again.
92+
You can then fetch and merge changes with
9493

9594
```
96-
$ git remote add upstream https://github.com/makenew/sass-package.git
9795
$ git fetch upstream
98-
$ git checkout -b sass-package upstream/libsass
96+
$ git merge upstream/libsass
9997
```
10098

10199
## Installation

0 commit comments

Comments
 (0)