I recommend always using "git pull --rebase --stat" to avoid unnecessary merges.
Marek On Tue, Feb 25, 2014 at 11:26 PM, Timothy Arceri <t_arc...@yahoo.com.au> wrote: > Hi Tom, > > I managed to accidentally revert your commit: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcd499730b225ec5a35902893c059086ba11b590 > > I managed to commit the same change: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b79582f322d4a89dd6d197c8d4962c788ae7f25 > Then panicked and reverted it which seems to have reverted both changes: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=9dfd7c5f75c806801b1b4b4d405899236c09ba75 > > I'm really sorry about this but you might want to push your change again, > I'd do it but I think I've done enough damage for one day. > > Tim > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
