On Fri, 09 Jun 2017, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: > I noticed when resolving a conflict that reappeared. > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drm-intel.rst | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drm-intel.rst b/drm-intel.rst > index c9c8812..4699171 100644 > --- a/drm-intel.rst > +++ b/drm-intel.rst > @@ -292,7 +292,7 @@ best way to go about this is: > > $ cd $DIM_PREFIX/drm-tip > $ git add -u > - $ git commmit > + $ git commit > > 2. Resolve the conflict normally, but don't stage it or commit it in any > fashion. Check that the resolution looks correct and removes all the conflict -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
