<html><body><div style="color:#000; background-color:#fff; font-family:HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;font-size:10pt">Thanks for the tip.<br><div style="display: block;" class="yahoo_quoted"> <br> <br> <div style="font-family: HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 10pt;"> <div style="font-family: times new roman, new york, times, serif; font-size: 12pt;"> <div dir="ltr"> <font face="Arial" size="2"> On Wednesday, 26 February 2014 9:46 AM, Marek Olšák <maraeo@gmail.com> wrote:<br> </font> </div> <div class="y_msg_container">I recommend always using "git pull --rebase --stat" to avoid unnecessary merges.<br clear="none"><br clear="none">Marek<br clear="none"><div class="yqt2471055386" id="yqtfd36616"><br clear="none">On Tue, Feb 25, 2014 at 11:26 PM, Timothy Arceri <<a shape="rect" ymailto="mailto:t_arceri@yahoo.com.au"
href="mailto:t_arceri@yahoo.com.au">t_arceri@yahoo.com.au</a>> wrote:<br clear="none">> Hi Tom,<br clear="none">><br clear="none">> I managed to accidentally revert your commit:<br clear="none">> <a shape="rect" href="http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcd499730b225ec5a35902893c059086ba11b590" target="_blank">http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcd499730b225ec5a35902893c059086ba11b590</a><br clear="none">><br clear="none">> I managed to commit the same change:<br clear="none">> <a shape="rect" href="http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b79582f322d4a89dd6d197c8d4962c788ae7f25" target="_blank">http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b79582f322d4a89dd6d197c8d4962c788ae7f25</a><br clear="none">> Then panicked and reverted it which seems to have reverted both changes:<br clear="none">> <a shape="rect"
href="http://cgit.freedesktop.org/mesa/mesa/commit/?id=9dfd7c5f75c806801b1b4b4d405899236c09ba75" target="_blank">http://cgit.freedesktop.org/mesa/mesa/commit/?id=9dfd7c5f75c806801b1b4b4d405899236c09ba75</a><br clear="none">><br clear="none">> I'm really sorry about this but you might want to push your change again,<br clear="none">> I'd do it but I think I've done enough damage for one day.<br clear="none">><br clear="none">> Tim<br clear="none">><br clear="none">> _______________________________________________<br clear="none">> mesa-dev mailing list<br clear="none">> <a shape="rect" ymailto="mailto:mesa-dev@lists.freedesktop.org" href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br clear="none">> <a shape="rect" href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br clear="none">><br
clear="none"></div><br><br></div> </div> </div> </div> </div></body></html>