Thanks paul! I couldn't have said it better. You can also see this process in detail in the forge contributor docs :)<br><br><a href="http://forge.github.com/docs/get_involved/contribute.html">http://forge.github.com/docs/get_involved/contribute.html</a><br>
<br>~Lincoln<br><br><div class="gmail_quote">On Tue, May 1, 2012 at 2:16 PM, Paul Bakker <span dir="ltr"><<a href="mailto:paul.bakker.nl@gmail.com" target="_blank">paul.bakker.nl@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
First of all, always use a branch to create pull requests, this makes it a lot easier to work on several things at a time without getting messy commits.<br>
To fix your current changeset you could create a new branch from master (without your changes) and re-apply your changes by either "cherry-picking" them or merging your existing branch into your new branch.<br>
Now squash commits by using interactive rebase (<a href="http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html" target="_blank">http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html</a>). You should never do this after you pushed to a remote location, but because this is a new branch it's perfectly fine.<br>
<br>
When you're happy with the changeset, push the branch to your github repo, and create a pull request from that branch. Just close the messy pull-request, it's probably easier to start clean.<br>
<br>
Hope that helps :-)<br>
<span class="HOEnZb"><font color="#888888"><br>
Paul<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
On May 1, 2012, at 22:12 , Thomas Frühbeck wrote:<br>
<br>
> Hi Paul,<br>
><br>
> one more question regarding git(hub).<br>
> The situation is the following:<br>
> - I have clone forge core on github<br>
> - have cloned it locally<br>
> - changed some code, committed _and pushed_ into my repository on github<br>
><br>
> Is there now any possibility to "remove"/revert/delete/undo this<br>
> _commit_ - not the change itself, just to keep history cleaner when<br>
> sending pull request?<br>
><br>
> Help appreciated,<br>
> Thomas<br>
><br>
> Am 01.05.2012 13:11, schrieb Paul Bakker:<br>
>> Not in GitHub, but you should squash changesets with git before creating a pull request.<br>
>><br>
>> Paul<br>
>><br>
>><br>
><br>
> _______________________________________________<br>
> forge-dev mailing list<br>
> <a href="mailto:forge-dev@lists.jboss.org">forge-dev@lists.jboss.org</a><br>
> <a href="https://lists.jboss.org/mailman/listinfo/forge-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/forge-dev</a><br>
<br>
<br>
_______________________________________________<br>
forge-dev mailing list<br>
<a href="mailto:forge-dev@lists.jboss.org">forge-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/forge-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/forge-dev</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>Lincoln Baxter, III<br><a href="http://ocpsoft.org" target="_blank">http://ocpsoft.org</a><br>"Simpler is better."<br>