update gerrit list

[openafs-wiki.git] / devel / GitDevelopers.mdwn

diff --git a/devel/GitDevelopers.mdwn b/devel/GitDevelopers.mdwn
index f0dd0c0..ec0f7fc 100644 (file)
--- a/devel/GitDevelopers.mdwn
+++ b/devel/GitDevelopers.mdwn
@@ -236,6 +236,8 @@ To make things easier, set up OpenSSH so that it knows about the defaults for th
     User <Username>
     IdentityFile ~/.ssh/id_rsa
     Port 29418
+    HostKeyAlgorithms +ssh-rsa
+    PubkeyAcceptedAlgorithms +ssh-rsa
 
 (where Username is the username you noted down from the 'Profile' page)
 
@@ -245,7 +247,7 @@ Gerrit introduces the concept of "change IDs". This is a unique reference for a
 
 The hook should be downloaded from the [[OpenAFS]] gerrit server by running the following, in the top level of your git tree
 
-    scp -p -P 29418 gerrit.openafs.org:hooks/commit-msg .git/hooks/
+    scp -O -p -P 29418 gerrit.openafs.org:hooks/commit-msg .git/hooks/
 
 ## <a name="Uploading to gerrit">Uploading to gerrit</a> 
 
@@ -267,11 +269,18 @@ Secondly, each commit should have a meaningful revision log. The internals of gi
 
 Thirdly, each commit should have a valid changeID. Manually maintaining these is difficult and error prone, so we would strong advise that you install the changeID hook detailed earlier. This will automatically add a [[ChangeId]] line to your commit message if it doesn't already contain one.
 
-Fourthly, each commit must adhere to the OpenAFS whitespace policy whereby new commits will not be accepted if they have trailing spaces, spaces before tabs, or indentation without tabs.  Git can be configured to highlight the whitespace policy violation with the following global setting:
+Fourthly, each commit must adhere to the OpenAFS whitespace policy whereby new
+commits will not be accepted if they have trailing spaces, spaces before tabs,
+or indentation without tabs for new files and functions. The prevailing
+formating conventions for exsiting code should be followed.  Unrelated
+formatting changes to code is discouraged.
+
+Git can be configured to highlight the whitespace policy violation with the
+following global setting:
 
     git config --global core.whitespace trailing-space,space-before-tab,indent-with-non-tab
 
-and 
+and
 
     git rebase --whitespace=fix