<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<body link="#355491" alink="#4262a1" vlink="#355491" style="background: #e2e2e2; margin: 0; padding: 20px;">
<div>
<table cellpadding="0" bgcolor="#FFFFFF" border="0" cellspacing="0" style="border: 1px solid #dadada; margin-bottom: 30px; width: 100%; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tbody>
<tr>
<td>
<table border="0" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" style="border: solid 2px #ccc; background: #dadada; width: 100%; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tbody>
<tr>
<td bgcolor="#000000" valign="middle" height="58px" style="border-bottom: 1px solid #ccc; padding: 20px; -moz-border-radius-topleft: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 5px; -webkit-border-top-left-radius: 5px;">
<h1 style="color: #333333; font: bold 22px Arial, Helvetica, sans-serif; margin: 0; display: block !important;">
<!-- To have a header image/logo replace the name below with your img tag -->
<!-- Email clients will render the images when the message is read so any image -->
<!-- must be made available on a public server, so that all recipients can load the image. -->
<a href="http://community.jboss.org/index.jspa" style="text-decoration: none; color: #E1E1E1">JBoss Community</a></h1>
</td>
</tr>
<tr>
<td bgcolor="#FFFFFF" style="font: normal 12px Arial, Helvetica, sans-serif; color:#333333; padding: 20px; -moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-left-radius: 5px;"><h3 style="margin: 10px 0 5px; font-size: 17px; font-weight: normal;">
Re: How I work with github jboss-as
</h3>
<span style="margin-bottom: 10px;">
created by <a href="http://community.jboss.org/people/david.lloyd%40jboss.com">David Lloyd</a> in <i>JBoss AS7 Development</i> - <a href="http://community.jboss.org/message/573666#573666">View the full discussion</a>
</span>
<hr style="margin: 20px 0; border: none; background-color: #dadada; height: 1px;">
<div class="jive-rendered-content"><blockquote class="jive-quote"><p>Thomas Diesler wrote:</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>I don't rebase a branch that I've pushed to a public repo because it breaks forks that where taken from that branch. Instead I regularly merge the changes from master to my feature branch.</p></blockquote><p>Rebasing doesn't really break forks of that branch, it just means that forks of that branch must in turn rebase before they can merge onto it.  Use one of the alternate forms of rebase:</p><pre class="jive-pre"><div id="_mcePaste" style="position: absolute; left: -10000px; top: 152px; width: 1px; height: 1px; overflow-x: hidden; overflow-y: hidden;">git rebase [-i | --interactive] [options] [--onto <newbase>]</div>git rebase [-i | --interactive] [options] [--onto <newbase>] <upstream> [<branch>] 
<div id="_mcePaste" style="position: absolute; left: -10000px; top: 152px; width: 1px; height: 1px; overflow-x: hidden; overflow-y: hidden;">               <upstream> [<branch>]</div>git rebase [-i | --interactive] [options] --onto <newbase> --root [<branch>]
<div id="_mcePaste" style="position: absolute; left: -10000px; top: 152px; width: 1px; height: 1px; overflow-x: hidden; overflow-y: hidden;">       git rebase [-i | --interactive] [options] --onto <newbase></div><div id="_mcePaste" style="position: absolute; left: -10000px; top: 152px; width: 1px; height: 1px; overflow-x: hidden; overflow-y: hidden;">            --root [<branch>]</div></pre><p>You just have to be sure that git knows what commits you're moving, and what you're moving them on to.</p></div>
<div style="background-color: #f4f4f4; padding: 10px; margin-top: 20px;">
<p style="margin: 0;">Reply to this message by <a href="http://community.jboss.org/message/573666#573666">going to Community</a></p>
<p style="margin: 0;">Start a new discussion in JBoss AS7 Development at <a href="http://community.jboss.org/choose-container!input.jspa?contentType=1&containerType=14&container=2225">Community</a></p>
</div></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>