Permalink
Browse files

Added Contribution Guidelines

* Added CONTRIBUTING.md file with guidelines
* Created link in README.md to contributing page
  • Loading branch information...
1 parent cf5566d commit dbc0ce837249281833c86247bc439143a31fd1d1 @adarsh adarsh committed Jun 20, 2012
Showing with 28 additions and 0 deletions.
  1. +23 −0 CONTRIBUTING.md
  2. +5 −0 README.md
View
23 CONTRIBUTING.md
@@ -0,0 +1,23 @@
+Contributing
+============
+
+> How can I contribute to this project?
+
+* Pull requests are always welcome
+* Address issues wherever possible
+* Prefix commit messages with [#XX] if addressing an existing issue number
+* Use the present tense in commit messages
+* Shorten commit messages to 50 characters with bulleted details
+
+Merging Pull Requests (for admins)
+----------------------------------
+* git remote add username git://github.com/username/trail-map.git
+* git fetch username
+* git cherry-pick aabbcceeddffgg...(this is the SHA)
+
+Then, edit the commit as necessary and then edit the commit message:
+
+git add -A
+git commit --amend -v
+
+Reasoning [detailed by Linus](https://github.com/torvalds/linux/pull/17)
View
5 README.md
@@ -42,6 +42,11 @@ To use these, you may want to first set up your laptop with
[this script](https://github.com/thoughtbot/laptop) and
[these dotfiles](https://github.com/thoughtbot/dotfiles).
+Contributing
+------------
+
+Please see [Contribution Guidelines](/thoughtbot/trail-map/blob/master/trails/CONTRIBUTING.md)
+
Credits
-------

0 comments on commit dbc0ce8

Please sign in to comment.