j/cyberware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: set upstream in sync handler, cleanup docs around setting up github

Browse source
This commit is contained in:
Jacky Zhao 2023-12-14 16:48:09 -08:00
parent a464ae5029
commit c35818c336
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/setting up your GitHub repository.md
View file

@ -12,10 +12,14 @@ At the top of your repository on GitHub.com's Quick Setup page, click the clipb
![[github-quick-setup.png]] ![[github-quick-setup.png]]
In your terminal of choice, navigate to the root of your Quartz folder. Then, run the following command, replacing `REMOTE-URL` with the URL you just copied from the previous step. In your terminal of choice, navigate to the root of your Quartz folder. Then, run the following commands, replacing `REMOTE-URL` with the URL you just copied from the previous step.
```bash ```bash
# add your repository
git remote add origin REMOTE-URL git remote add origin REMOTE-URL
# track the main quartz repository for updates
git remote add upstream https://github.com/jackyzha0/quartz.git
``` ```
To verify that you set the remote URL correctly, run the following command. To verify that you set the remote URL correctly, run the following command.

2
quartz/cli/handlers.js
View file

@ -528,7 +528,7 @@ export async function handleSync(argv) {
await popContentFolder(contentFolder) await popContentFolder(contentFolder)
if (argv.push) { if (argv.push) {
console.log("Pushing your changes") console.log("Pushing your changes")
const res = spawnSync("git", ["push", "-f", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
stdio: "inherit", stdio: "inherit",
}) })
if (res.status !== 0) { if (res.status !== 0) {