From: Arthur Axel "fREW" Schmidt Date: Thu, 3 Jun 2010 15:59:47 +0000 (+0000) Subject: Update CONTRIBUTING to point to our actual repo X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b327fc93d879fa7f8aac8a9d63388cc86c065a6a;p=dbsrgits%2FDBIx-Class-Historic.git Update CONTRIBUTING to point to our actual repo --- diff --git a/CONTRIBUTING b/CONTRIBUTING index cc12931..2c5fc26 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: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.