summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/git.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-03 10:25:45 +0000
committerintrigeri <intrigeri@boum.org>2015-03-03 10:25:45 +0000
commit131d8f78a3cbd86f0fdba929e72130b80070c134 (patch)
tree7edd2164003fac96d2a25201ffe3e642b3f7b15b /wiki/src/contribute/git.mdwn
parent9e7aa97db078177c8f36d227a22b8a79da5096b6 (diff)
parent5ec5f06708514a494044e40a175e8d80fa446e5a (diff)
Merge remote-tracking branch 'origin/master' into faq/7926-apt-get-upgradefaq/7926-apt-get-upgrade
Diffstat (limited to 'wiki/src/contribute/git.mdwn')
-rw-r--r--wiki/src/contribute/git.mdwn33
1 files changed, 22 insertions, 11 deletions
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index a05fb2c..7b5d696 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -57,14 +57,7 @@ See our [[contribute/merge_policy]].
Caution!
--------
-If you want to commit patches that may be published later, you might
-want to anonymize them a bit; to do so, run the following commands
-in every of your local clones' directories:
-
- git config user.name 'Tails developers'
- git config user.email tails@boum.org
-
-If you intend to prepare Tails releases, you'll also need to make
+If you intend to prepare Tails releases, you'll need to make
the development team signing key the default one for Git tags:
git config user.signingkey 1202821CBE2CD9C1
@@ -72,12 +65,13 @@ the development team signing key the default one for Git tags:
Creating a new repository
-------------------------
-1. Create a new repository at immerda.
-2. Create a pull-style mirror at repo.or.cz.
+Create a new repository at immerda.
Repositories
============
+<a id="main-repo"></a>
+
Main repository
---------------
@@ -89,7 +83,7 @@ Anyone can check it out like this:
Developers with write access to the repositories should instead:
- git clone 'ssh://boum_org_amnesia@webmasters.boum.org/~/wiki.git'
+ git clone boum_org_amnesia@webmasters.boum.org:wiki.git
We have a [web interface](https://git-tails.immerda.ch/tails/)
available for the main repository.
@@ -167,6 +161,23 @@ any development.
Please note that the `experimental` branch can be broken, have awful
security problems and so on. No guarantee, blablabla.
+Promotion material
+------------------
+
+This repository contains Tails [[promotion
+material|contribute/how/promote/material]].
+
+Anyone can check it out like this:
+
+ git clone https://git-tails.immerda.ch/promotion-material
+
+Developers with write access to the repositories should instead:
+
+ git clone boum_org_amnesia@webmasters.boum.org:promotion-material.git
+
+We have a [web interface](https://git-tails.immerda.ch/promotion-material/)
+available for the promotion material repository.
+
<a id="puppet"></a>
Puppet modules