[Bast-commits] r9580 - DBIx-Class/0.08/trunk

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-06-03 16:59:47 +0100 (Thu, 03 Jun 2010)
New Revision: 9580

Modified:
   DBIx-Class/0.08/trunk/CONTRIBUTING
Log:
Update CONTRIBUTING to point to our actual repo

Modified: DBIx-Class/0.08/trunk/CONTRIBUTING
===================================================================
--- DBIx-Class/0.08/trunk/CONTRIBUTING	2010-06-03 15:28:07 UTC (rev 9579)
+++ DBIx-Class/0.08/trunk/CONTRIBUTING	2010-06-03 15:59:47 UTC (rev 9580)
@@ -1,10 +1,19 @@
 With DBIx::Class on git now, this is the process for contributing.
 
-1) Clone the DBIx::Class master branch at ABCDEFGH
+1) Clone the DBIx::Class master branch
+   > git clone dbsrgits at git.shadowcat.co.uk:dbsrgits/DBIx-Class.git
 2) Do your work on your machine. This is git - everything is local!
-3) When you think you're ready, push it back out to ABCDEFGH as a remote branch.
-4) Notify the other contributors that you're ready to have your branch reviewed.
-5) Another contributor will merge it back into master.
+3) When you think you're ready, push it back out to the origin as a
+   remote branch.  See rebasing for what you should do before pushing.
+   > git push origin my-branch
+4) Notify the other contributors that you're ready to have your branch
+   reviewed.
+5) Another contributor will merge it back into master.  See rebasing for
+   what you should do before merging.
 
+Rebasing: Please rebase before merging and pushing; we'd rather not have
+commit messages that say, "Oops" and "typo", in master, and furthermore
+fast-forward merges lead to a cleaner history.
+
 Yes, this does mean that DBIx::Class is moving to a formal code review process.
 Yes, this does mean that you will never merge your own code to master.