[cairo-commit] [cairo-www] src/cairomm.mdwn

[Carl Worth]

 src/cairomm.mdwn |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 8849ed0dc75af36da4cab38208dbc211de40d1d5
Author: murrayc <murrayc at murrayc.com>
Date:   Thu Jul 12 11:39:08 2007 -0700

    Rearrange because patch generation is more common than direct upstream committing. Don't encourage people to fork. They can use their own git, but I still want a patch to review in bugzilla.

diff --git a/src/cairomm.mdwn b/src/cairomm.mdwn
index f8dc368..8f800c4 100644
--- a/src/cairomm.mdwn
+++ b/src/cairomm.mdwn
@@ -66,6 +66,7 @@ Use bugzilla to [submit cairomm bugs][bugs]. Here is a list of [open
 cairomm bugs][open bugs].
 
 # Using Git
+
 Newer versions of git allow you set your name and email properly so your commits are properly attributed.  You can do so as follows (using your real name and email address, of course):
 
     git config --global user.name "John Doe"
@@ -75,35 +76,37 @@ You can update a local repository by pulling the changes from the central reposi
 
     git pull origin
 
-when you've made some changes, you can commit them to your local repository with the command:
-
-    git commit -a
-
-After you've made one or more commits to your local repository and you want to push them out to the central repository (if your repository was checked out with the developer command above), you can do so with tthe following command:
+## To create and submit patches
 
-    git push origin
-
-If you don't have a developer account (and thus can't push directly to the central repository), but would like to have some of your local changes incorporated into the central repository, you can create a patch with the following commands:
+If you don't have a developer account (and thus can't push directly to the central repository), but would like to have some of your local changes incorporated into the central repository, you can create a patch with the following command:
 
-    # there are several commits on your local branch
     git format-patch origin
     # this will spit out a separate diff for each commit as a file named
     # 0001-description-of-first-commit.txt
     # 0002-description-of-second-commit.txt
-    # ...
 
 You can then open a bug and attach these patches so that someone with a developer account can apply them.  If you want to generate a big patch between your local repository and the central repository, you can do so as follows:
 
     git pull origin   # make sure your repository is up-to-date
     git diff HEAD origin > my-patch.diff
 
-Alternatively, if your git repository is somewhere that is publicly accessible via the web, you can simply email one of the developers and request that they pull from your repository.  When creating patches, you should remember to patch the ChangeLog as well with a description of what you've changed.
+## If you have write access
+
+when you've made some changes, you can commit them to your local repository with the command:
+
+    git commit -m "Commit message"
+
+The commit message should generally be a copy/paste of your entry in the ChangeLog. Always remember to make an entry in the ChangeLog, in the style of the existing ChangeLog entries.
+
+After you've made one or more commits to your local repository and you want to push them out to the central repository (if your repository was checked out with the developer command above), you can do so with the following command:
+
+    git push origin
+
 
 Freedesktop.org has some additional instructions on
 [using git](http://www.freedesktop.org/wiki/Infrastructure/git/Developers). You can also view the code online with [gitweb](http://gitweb.cairographics.org/?p=cairomm.git;a=tree).
 
 
-
    [gtkmm]:	http://gtkmm.org/
    [cvs]:	http://freedesktop.org/wiki/UsingCvs
    [viewcvs]:	http://webcvs.freedesktop.org/cairo/cairomm/