Re: [Mesa-dev] Accidental Mesa revert

2014-02-25 Thread Timothy Arceri
Thanks for the tip. On Wednesday, 26 February 2014 9:46 AM, Marek Olšák wrote: I recommend always using "git pull --rebase --stat" to avoid unnecessary merges. Marek On Tue, Feb 25, 2014 at 11:26 PM, Timothy Arceri wrote: > Hi Tom, > > I managed to accidentally revert your commit: > http

Re: [Mesa-dev] Accidental Mesa revert

2014-02-25 Thread Marek Olšák
I recommend always using "git pull --rebase --stat" to avoid unnecessary merges. Marek On Tue, Feb 25, 2014 at 11:26 PM, Timothy Arceri wrote: > Hi Tom, > > I managed to accidentally revert your commit: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcd499730b225ec5a35902893c059086ba11b590 >

Re: [Mesa-dev] Accidental Mesa revert

2014-02-25 Thread Tom Stellard
On Tue, Feb 25, 2014 at 02:26:34PM -0800, Timothy Arceri 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/mes

[Mesa-dev] Accidental Mesa revert

2014-02-25 Thread Timothy Arceri
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 revert