diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-13 20:46:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-13 20:46:12 (GMT) |
| commit | 96af0bf1ea1b96ecf960b64568d7c5793d863602 (patch) | |
| tree | 4b0528d37d5bcace29b462044024e66bc0868e4f | |
| parent | b95c7e9810bdd1982e4587ef52c546df9ebc875e (diff) | |
| download | mxe-96af0bf1ea1b96ecf960b64568d7c5793d863602.zip mxe-96af0bf1ea1b96ecf960b64568d7c5793d863602.tar.gz mxe-96af0bf1ea1b96ecf960b64568d7c5793d863602.tar.bz2 | |
Document recommended .git/config settings for committers
| -rw-r--r-- | index.html | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -475,6 +475,30 @@ USE_OSGPLUGIN(<plugin2>) and to <a href="#creating-packages">propose new packages</a>. </p> + <h3>For Committers</h3> + + <p> + The following <code>.git/config</code> settings ensure + that the stable branch will always be pushed to the + <code>gh-pages</code> branch in addition to the + <code>stable</code> branch, + thus ensuring the website will always stay in sync: + </p> + <pre>[remote "origin"] + url = git@github.com:mxe/mxe.git + fetch = +refs/heads/*:refs/remotes/origin/* + push = refs/heads/master:refs/heads/master + push = refs/heads/stable:refs/heads/stable + push = refs/heads/stable:refs/heads/gh-pages +[branch "master"] + remote = origin + merge = refs/heads/master +[branch "stable"] + remote = origin + merge = refs/heads/stable</pre> + + <h3>Branch Concept</h3> + <p> For the sake of simplicity, there are just two branches, "master" and "stable". Although it might |