hal: Branch 'master'

[David Zeuthen]

 HACKING |    6 ++++++
 1 files changed, 6 insertions(+)

New commits:
diff-tree 15376ac7c17fa31033adefcfe106935e09b5b0df (from 47a1cf8d1ad4b64ea5291ee5cc71a533a1c91e54)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sat Jul 29 13:11:39 2006 -0400

    clarify how to get a diff between your local repo and the master repo

diff --git a/HACKING b/HACKING
index 0837abd..3be1b90 100644
--- a/HACKING
+++ b/HACKING
@@ -29,6 +29,12 @@ SCM
 
  - diff of local repository vs. master repository at fd.o
 
+   synchronize with upstream repo:
+   $ git pull
+
+   (possibly merge changes)
+
+   generate the diff:
    $ git diff origin HEAD
 
  - influential environment variables (set these in e.g. .bash_profile)