diff --git a/README.md b/README.md index f00f63e..932fe19 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Anyone can contribute by doing this: There are many methods for contributing, here is the list by order of preference (more easier to handle): -1. make an account on tildegit, fork the project, create a new branch with changes and send us Merge Requests (it's easy once you get how this work). +1. make an account on tildegit, fork the project, create a new branch with changes and send us Merge Requests (it's easy once you get how this work. See "Git usage below"). 2. make a local commit from a freshly updated cloned repository and use `git format-patch` to send an email to a contributor (currently solene) so your commit can be merged into the repository easily. 3. send a simple diff to a contributor. 4. open an issue. @@ -47,3 +47,32 @@ For each issue we will try to write about these topics: - one piece of artwork - a few interesting links to social medias +## Git usage + +Fork this project and clone your own fork. +Then add the upstream repo. + +``` +$ git clone git@tildegit.org:foo/openbsd-webzine.git +$ cd openbsd-webzine +$ git remote add upstream https://tildegit.org/solene/openbsd-webzine.git +``` + +Keep your fork sync with upstream. + +``` +$ git pull upstream main +``` + +You can now edit files. + +At last, add modified files and commit : + +``` +$ git add issue-*/ +$ git commit -m "message" +$ git push +``` + +You can now ask for a merge request : +Menu > Projects > Merge request tab > New request button diff --git a/issues/Makefile b/issues/Makefile index 65bb002..c1cf80b 100644 --- a/issues/Makefile +++ b/issues/Makefile @@ -6,9 +6,9 @@ clean: rm ../dev/*html test: - ./make_issue.sh current ~/Downloads/current-issue.html - xdg-open ~/Downloads/current-issue.html + ./make_issue.sh current /tmp/current-issue.html + xdg-open /tmp/current-issue.html testsite: - cp -fr ../public ~/Downloads/ - xdg-open ~/Downloads/public/index.html + cp -fr ../public /tmp/ + xdg-open /tmp/public/index.html diff --git a/issues/_template/91_QUOTES.html b/issues/_template/91_QUOTES.html new file mode 100644 index 0000000..6c55638 --- /dev/null +++ b/issues/_template/91_QUOTES.html @@ -0,0 +1,9 @@ +
🐡🐡🐡
+ + diff --git a/issues/issue-1/70_LINKS.html b/issues/issue-1/70_LINKS.html index e1c3805..7a7cabc 100644 --- a/issues/issue-1/70_LINKS.html +++ b/issues/issue-1/70_LINKS.html @@ -1,6 +1,7 @@ - +
  • OpenBSD Now! Unofficial OpenBSD news, updates and thoughts
  • +
  • A curated list of awesome OpenBSD resources
  • + diff --git a/issues/issue-1/91_QUOTES.html b/issues/issue-1/91_QUOTES.html new file mode 100644 index 0000000..7d896ea --- /dev/null +++ b/issues/issue-1/91_QUOTES.html @@ -0,0 +1,13 @@ +
    🐡🐡🐡
    + +

    Quote

    +
    + + -- Marc Chantreux on misc@ +