From: Jani Nikula <jani.nikula@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [maintainer-tools PATCH] drm-intel: Fix small typo.
Date: Fri, 16 Jun 2017 16:09:19 +0300 [thread overview]
Message-ID: <87tw3gcc5c.fsf@intel.com> (raw)
In-Reply-To: <1497035133-21815-1-git-send-email-rodrigo.vivi@intel.com>
On Fri, 09 Jun 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> I noticed when resolving a conflict that reappeared.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2017-06-16 13:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 19:05 [maintainer-tools PATCH] drm-intel: Fix small typo Rodrigo Vivi
2017-06-16 13:09 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tw3gcc5c.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.