asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ti...@apache.org
Subject incubator-asterixdb-site git commit: Update site edit instructions
Date Mon, 29 Feb 2016 23:16:25 GMT
Repository: incubator-asterixdb-site
Updated Branches:
  refs/heads/asf-site 50ec6d2f1 -> d7b4d759c


Update site edit instructions

Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/680
Reviewed-by: Till Westmann <tillw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site/commit/d7b4d759
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site/tree/d7b4d759
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site/diff/d7b4d759

Branch: refs/heads/asf-site
Commit: d7b4d759c9d05de89f1a865a9a93703a44aad708
Parents: 50ec6d2
Author: Ian Maxon <ian@maxons.email>
Authored: Mon Feb 29 14:53:53 2016 -0800
Committer: Till Westmann <tillw@apache.org>
Committed: Mon Feb 29 15:07:45 2016 -0800

----------------------------------------------------------------------
 site.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site/blob/d7b4d759/site.md
----------------------------------------------------------------------
diff --git a/site.md b/site.md
index f4f7487..06e87fb 100644
--- a/site.md
+++ b/site.md
@@ -22,15 +22,22 @@ A full tutorial about how to use Jekyll is out of the scope of this document,
bu
 
 The website is managed using `git`. Clone the site as usual
 
-         ➤ git clone https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
+         ➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
 
 You will notice lots of Markdown files and HTML templates in the repository root. The compiled
content of the website itself is served from the `content/` folder in this repository. That
is to say, that the actual content of the website itself, as well as its sources are stored
in the same repository. Additionally, the main branch on this repository is `asf-site` and
not `master`
 
 Gerrit is used to submit code reviews for the website just as it is with the main codebase.
The main difference the site is not strictly subject to code reviews.
 
-To add the Gerrit repository for this site, add it as a normal git remote:
 
-        ➤ git remote add gerrit ssh://YOU@asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site
+Then, you likely will want to check out to make your own topic branch as to not work directly
on the "live" branch, like so:
+
+
+        ➤ git checkout -b YOU/site
+
+And perform the git-gerrit init on this branch
+
+
+        ➤ git gerrit init -u ssh://YOU@asterix-gerrit.ics.uci.edu:29418/ -p incubator-asterixdb-site
 
 
 ## Making a change to the site
@@ -55,22 +62,20 @@ Right now git gerrit submit isn't used for the website, so you must construct
th
 Once you have made your commit, push it to Gerrit for review:
 
 
-       ➤ git push gerrit HEAD:refs/for/asf-site
-
+       ➤ git gerrit submit -b asf-site
 
-If no Change-Id is provided, "ERROR: missing Change-Id in commit message footer" is returned
when attempting to push to Gerrit. The error description also contains a) a proposal for a
Change-Id that can be pasted to the commit message and b) instructions how to install a commit-msg
hook into the local git repository that will automatically add a Change-Id.
 
 ### Submitting the change to the live site
 
 When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site
branch:
 
 
-       ➤ git pull gerrit
+       ➤ git fetch gerrit
 
 
 Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this
with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
 
 
-       ➤ git push origin (SHA1 of submitted commit)
+       ➤ git push origin (SHA1 of submitted commit):asf-site
 
 


Mime
View raw message