HACKING: add more explicit git branch/tag instructions

diff --git a/ChangeLog b/ChangeLog
index 7d3a3373fc78774fad2b65ff48e29d835a1eb6e1..1c9168fa396c0cf97dfd3c6637ff7b429e0c2e25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-13  Ryan Lortie  <desrt@desrt.ca>
+
+       * HACKING: add more explicit git branch/tag instructions
+
 2007-09-13  Ryan Lortie  <desrt@desrt.ca>
 
        migrate from cvs to git (cvs2svn -> git-svnimport).

diff --git a/HACKING b/HACKING
index 9de5955fe5e8f709767c50f0f5ce1e544c5c6e28..37abd7755f69d0823f062dc0f0f2708cab8ec3a9 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -97,7 +97,9 @@ To make a release of D-Bus, do the following:
    release! The idea is that git has a newer version number
    than anything released.
 
- - push your changes to the central repository
+ - push your changes to the central repository with "git-push"
+
+ - push your new tag, too: "git-push origin dbus-X.Y.Z"
 
  - scp your tarball to freedesktop.org server and copy it 
    to /srv/dbus.freedesktop.org/www/releases/dbus. This should 
@@ -135,13 +137,13 @@ allow committing that change.
 The branch name should be dbus-X.Y-branch which is a branch that has
 releases versioned X.Y.Z
 
-To branch, add a tag to the common ancestor:
- git tag dbus-X.Y-branchpoint
-then create the branch:
- git branch dbus-X.Y-branch
+To branch:
+  git branch dbus-X.Y-branch
+and upload the branch tag to the server:
+  git-push origin dbus-X.Y-branch
 
-Note that dbus-X.Y-branchpoint may not tag the same revision as the
-dbus-X.Y.0 release, since we may not branch immediately.
+To develop in this branch:
+  git-checkout dbus-X.Y-branch
 
 Environment variables
 ===