[PATCH 3/4] doc: document the drm-rerere branch

[Sean Paul]

On Mon, Jan 29, 2018 at 02:28:54PM +0200, Jani Nikula wrote:
> Add a brief description of drm-rerere.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>


Reviewed-by: Sean Paul <seanpaul at chromium.org>

> ---
>  repositories.rst | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/repositories.rst b/repositories.rst
> index a10ef934bced..d39d5651b08c 100644
> --- a/repositories.rst
> +++ b/repositories.rst
> @@ -160,3 +160,12 @@ This is the overall integration tree for drm, and lives in
>  is updated drm-tip gets rebuilt. If there's a conflict see section on `resolving
>  conflicts when rebuilding drm-tip
>  <drm-intel.html#resolving-conflicts-when-rebuilding-drm-tip>`_.
> +
> +drm-rerere
> +~~~~~~~~~~
> +
> +This branch contains the `nightly.conf`_ configuration file and the shared ``git
> +rerere`` conflict resolutions for dim to generate drm-tip, as well as some
> +kernel defconfig files for build testing.
> +
> +.. _nightly.conf: https://cgit.freedesktop.org/drm/drm-tip/plain/nightly.conf?h=rerere-cache
> -- 
> 2.11.0
> 
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools

-- 
Sean Paul, Software Engineer, Google / Chromium OS