aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-05-09 21:42:44 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-05-09 21:42:44 +0200
commit58a41e73e4b6e59c7e9f7773d6ef7807f3eee701 (patch)
treecf1db605095c2b695a74ec71d584dc84ea8abf0d /README.md
parent7157af2550b1b26fb71a7fac17ea67f36f117f7e (diff)
downloadjquery-ui-58a41e73e4b6e59c7e9f7773d6ef7807f3eee701.tar.gz
jquery-ui-58a41e73e4b6e59c7e9f7773d6ef7807f3eee701.zip
Readme update: Some instructions for cherry-picking from pull requests
Diffstat (limited to 'README.md')
-rw-r--r--README.md17
1 files changed, 17 insertions, 0 deletions
diff --git a/README.md b/README.md
index 5c7d79a13..9a0d7c5c5 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,20 @@ If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get s
If you are interested in helping developing jQuery UI, you are in the right place.
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
+
+For commiters
+---
+When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
+
+Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
+
+ git remote add [username] [his-fork.git] -f
+
+If you want just one commit and edit the commit message:
+
+ git cherry-pick -e [sha-of-commit]
+
+If it should go to the stable brach, cherry-pick it to stable:
+
+ git checkout 1-8-stable
+ git cherry-pick -x [sha-of-commit]