From f146b164a96d68569c02426fa8466aa255b186af Mon Sep 17 00:00:00 2001 From: Anne-Gaelle Colom Date: Sun, 3 May 2015 09:41:58 +0100 Subject: [PATCH 1/4] Websites: Clarify deploy and tag stage --- pages/web-sites.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pages/web-sites.md b/pages/web-sites.md index 83b66f56..48482738 100644 --- a/pages/web-sites.md +++ b/pages/web-sites.md @@ -120,8 +120,14 @@ For other sites: To create a tag, use `npm version [major | minor | patch]`. -Afterwards, make sure to push both version change commit and the tag: -`git push --tags origin master` +Afterwards, make sure to push both version change commit and the tag to the main jQuery repo. + +
You'll want to check your remote setup using ```git remote -v``` and check which remote is used for the main jQuery repo.
+ +If ```upstream``` is the remote you use for that, type: +`git push --tags upstream master` + +If you use ```origin``` for the main jQuery repo, replace ```upstream``` with ```origin``` in the command above. --- From 79a2dc98587e24a04005f54b9e7826b4bd30af25 Mon Sep 17 00:00:00 2001 From: Anne-Gaelle Colom Date: Sun, 3 May 2015 10:12:30 +0100 Subject: [PATCH 2/4] Websites: Replaced md inside html block with html --- pages/web-sites.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/web-sites.md b/pages/web-sites.md index 48482738..3a9f71a0 100644 --- a/pages/web-sites.md +++ b/pages/web-sites.md @@ -122,12 +122,12 @@ To create a tag, use `npm version [major | minor | patch]`. Afterwards, make sure to push both version change commit and the tag to the main jQuery repo. -
You'll want to check your remote setup using ```git remote -v``` and check which remote is used for the main jQuery repo.
+
You'll want to check your remote setup using git remote -v and check which remote is used for the main jQuery repo.
-If ```upstream``` is the remote you use for that, type: +If `upstream` is the remote you use for that, type: `git push --tags upstream master` -If you use ```origin``` for the main jQuery repo, replace ```upstream``` with ```origin``` in the command above. +If you use `origin` for the main jQuery repo, replace `upstream` with `origin` in the command above. --- From d071cf281020bbf3e0a00f088fc00c45885cdb01 Mon Sep 17 00:00:00 2001 From: Anne-Gaelle Colom Date: Sun, 3 May 2015 19:27:41 +0100 Subject: [PATCH 3/4] Website: Reword according to feedback --- pages/web-sites.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pages/web-sites.md b/pages/web-sites.md index 3a9f71a0..5289aea8 100644 --- a/pages/web-sites.md +++ b/pages/web-sites.md @@ -120,14 +120,10 @@ For other sites: To create a tag, use `npm version [major | minor | patch]`. -Afterwards, make sure to push both version change commit and the tag to the main jQuery repo. - -
You'll want to check your remote setup using git remote -v and check which remote is used for the main jQuery repo.
- -If `upstream` is the remote you use for that, type: +Afterwards, make sure to push both version change commit and the tag: `git push --tags upstream master` -If you use `origin` for the main jQuery repo, replace `upstream` with `origin` in the command above. +
The example above uses `upstream` for the repo in the jQuery organization on GitHub. Use git remote -v to ensure that you're pushing to the correct remote repo. For example, if you use orgin for the repo in the jQuery organization, replace upstream with origin.
--- From 88053ef88973555b7f6e60df5a29a70a5515e2b1 Mon Sep 17 00:00:00 2001 From: Anne-Gaelle Colom Date: Sun, 3 May 2015 19:33:14 +0100 Subject: [PATCH 4/4] Website: Only use html in html block --- pages/web-sites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/web-sites.md b/pages/web-sites.md index 5289aea8..03cabc5c 100644 --- a/pages/web-sites.md +++ b/pages/web-sites.md @@ -123,7 +123,7 @@ To create a tag, use `npm version [major | minor | patch]`. Afterwards, make sure to push both version change commit and the tag: `git push --tags upstream master` -
The example above uses `upstream` for the repo in the jQuery organization on GitHub. Use git remote -v to ensure that you're pushing to the correct remote repo. For example, if you use orgin for the repo in the jQuery organization, replace upstream with origin.
+
The example above uses upstream for the repo in the jQuery organization on GitHub. Use git remote -v to ensure that you're pushing to the correct remote repo. For example, if you use orgin for the repo in the jQuery organization, replace upstream with origin.
---