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

Thu Jul 12 07:52:25 PDT 2007

src/cairomm.mdwn |   72 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

New commits:
commit b21e625057ae0bdbd35cfd861fb025517e915c98
Author: JonathonJongsma <jonathon.jongsma at gmail.com>
Date:   Thu Jul 12 07:52:24 2007 -0700

    move some git usage stuff to the bottom of the page to not clutter things up too much

diff --git a/src/cairomm.mdwn b/src/cairomm.mdwn
index cff4f1c..f74c5d9 100644
--- a/src/cairomm.mdwn
+++ b/src/cairomm.mdwn
@@ -27,36 +27,9 @@ You can commit changes to your local repository but will not be able to push the
 
     git clone git.cairographics.org:/git/cairomm
 
-This will use ssh to perform the checkout and will require you to have a freedesktop.org account.  Be sure to set you name and email properly so that your commits get properly attributed.  You can do so as follows (using your real name and email address, of course):
+This will use ssh to perform the checkout and will require you to have a freedesktop.org account.  
 
-    git config --global user.name "John Doe"
-    git config --global user.email john.doe at domain.com
-
-You can update a local repository by pulling the changes from the central repository with the command:
-
-    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:
-
-    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:
-
-    # 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.  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.
-
-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).
+For some basic information on using git, see the "Using Git" section below.
 
 # Documentation
 
@@ -84,7 +57,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the [GNU
 Library General Public License][LGPL] for more details.
 
-## Contact
+# Contact
 
 For questions or to contact the developers, please use the [cairo
 mailing list](/lists/).
@@ -92,6 +65,45 @@ mailing list](/lists/).
 Use bugzilla to [submit cairomm bugs][bugs]. Here is a list of [open
 cairomm bugs][open bugs].
 
+# Using Git
+Be sure to set you name and email properly so that your commits get properly attributed.  You can do so as follows (using your real name and email address, of course):
+
+    git config --global user.name "John Doe"
+    git config --global user.email john.doe at domain.com
+
+You can update a local repository by pulling the changes from the central repository with the command:
+
+    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:
+
+    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:
+
+    # 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.
+
+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/
