comparison index.html @ 2388:1f418794d59f

Document recommended .git/config settings for committers
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 13 Apr 2012 22:46:12 +0200
parents 5c1a76a8334b
children d850f952f766 f682ec903c52
comparison
equal deleted inserted replaced
2387:54da84393840 2388:1f418794d59f
473 feel free to join the 473 feel free to join the
474 <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">project mailing list</a> 474 <a href="http://lists.nongnu.org/mailman/listinfo/mingw-cross-env-list">project mailing list</a>
475 and to <a href="#creating-packages">propose new packages</a>. 475 and to <a href="#creating-packages">propose new packages</a>.
476 </p> 476 </p>
477 477
478 <h3>For Committers</h3>
479
480 <p>
481 The following <code>.git/config</code> settings ensure
482 that the stable branch will always be pushed to the
483 <code>gh-pages</code> branch in addition to the
484 <code>stable</code> branch,
485 thus ensuring the website will always stay in sync:
486 </p>
487 <pre>[remote "origin"]
488 url = git@github.com:mxe/mxe.git
489 fetch = +refs/heads/*:refs/remotes/origin/*
490 push = refs/heads/master:refs/heads/master
491 push = refs/heads/stable:refs/heads/stable
492 push = refs/heads/stable:refs/heads/gh-pages
493 [branch "master"]
494 remote = origin
495 merge = refs/heads/master
496 [branch "stable"]
497 remote = origin
498 merge = refs/heads/stable</pre>
499
500 <h3>Branch Concept</h3>
501
478 <p> 502 <p>
479 For the sake of simplicity, there are just two 503 For the sake of simplicity, there are just two
480 branches, "master" and "stable". Although it might 504 branches, "master" and "stable". Although it might
481 seem obvious, here's an overview of the types of 505 seem obvious, here's an overview of the types of
482 changes that go into each branch: 506 changes that go into each branch: