New trouts from rejs

[irc.git] / git-notes.txt

diff --git a/git-notes.txt b/git-notes.txt
index ce2e34d31b757e59b2a22b6fde6c0724b86f8115..db8dd332e8e81321f5454325afddd2e4d6977cd3 100644 (file)
--- a/git-notes.txt
+++ b/git-notes.txt
@@ -1,6 +1,11 @@
-to edit servus.html ; edit in the web clone (and git-commit -a ), then
+                    Git notes for Servus hackers
+
+To edit servus.html ; edit in the web clone (and git-commit -a ), then
 from the live version do git-pull html.
 
+Rather than running git-pull in the html dir, instead run
+pull-and-update.sh which runs git-update-server-info too.
+
 to get a copy, either:
 git-clone http://www.pick.ucam.org/~matthew/irc/.git/ [if
 git-update-server-info has been run in the web clone]
@@ -14,3 +19,5 @@ programming/irc/bot-test contains a clone of bot, but with
 Servus-chiark.py changed to launch a test version into #test. If you
 git-pull in there, you can then launch the new code and check it works
 before killing and reloading Servus proper.
+
+git-fetch can be used to consider other trees before committing them.