Thanks Sasha, I will push them.<br><br>Gonzalo<br><br><br><div class="gmail_quote">On Wed, Oct 6, 2010 at 5:37 PM, Sascha Silbe <span dir="ltr"><<a href="mailto:sascha-ml-reply-to-2010-3@silbe.org">sascha-ml-reply-to-2010-3@silbe.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">Excerpts from Lucian Branescu's message of Wed Oct 06 21:30:44 +0200 2010:<br>
<div class="im"><br>
> > OK, then let's land both patches now (unless Lucian vetoes), but keep<br>
> > the tickets open so we can give a closer look later.<br>
> Fine by me. Will you do it Sascha, or shall I?<br>
<br>
</div>Gonzalo, you already have push rights, so please push yourself.<br>
<br>
Please remember:<br>
<div class="im"><br>
> > Please fix the summaries before pushing. E.g.:<br>
> ><br>
> > fix downloading files with non-ASCII characters (OLPC#8857)<br>
> > generate preview image for downloaded images (SL#1106)<br>
<br>
</div>"git commit --amend" should do the trick.<br>
<br>
If you have "dirty" history (i.e. other patches that are not in mainline<br>
yet) please create a branch carrying only those two patches and push<br>
that branch:<br>
<br>
git checkout -b to-push origin/master<br>
git cherry-pick <commit ID of first patch><br>
git commit --amend<br>
(fix summary)<br>
git cherry-pick <commit ID of second patch><br>
git commit --amend<br>
(fix summary)<br>
git push origin to-push:master<br>
<br>
You can remove the branch afterwards:<br>
<br>
git checkout master<br>
git branch -d to-push<br>
<br>
Sascha<br>
<font color="#888888"><br>
--<br>
<a href="http://sascha.silbe.org/" target="_blank">http://sascha.silbe.org/</a><br>
</font><div><div></div><div class="h5"><a href="http://www.infra-silbe.de/" target="_blank">http://www.infra-silbe.de/</a><br>
</div></div><br>_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
<br></blockquote></div><br>