X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=blobdiff_plain;f=CONTRIBUTING;h=586ec4c6fe47b1635b5755a1d0435c1d7731a9a5;hp=cc1293154f4b544d96a3ddadbc0639284d6a8f5f;hb=8f4b5c084378a4c457c8893404aded4398c1d811;hpb=0f6f847aa05b62e97048ccad7cf3f4e864c630f4

diff --git a/CONTRIBUTING b/CONTRIBUTING
index cc12931..586ec4c 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -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@git.shadowcat.co.uk: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.