[maintainer-tools PATCH 1/3] dim: Autocreate tracking branch in checkout

[maintainer-tools PATCH 1/3] dim: Autocreate tracking branch in checkout

[Daniel Vetter]

Tvrtko stumbled over this one.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index 1fd0217588f6..98efba80d9a4 100755
--- a/dim
+++ b/dim
@@ -417,7 +417,11 @@ function dim_cd
 function dim_co
 {
 	dim_cd $1
-	git checkout $1
+	if ! git branch | grep $1 > /dev/null ; then
+		git checkout -t $DIM_DRM_INTEL_REMOTE/$1
+	else
+		git checkout $1
+	fi
 }
 
 function check_repo_clean
-- 
2.5.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 2/3] drm-intel: Add link to dim manpage

[Daniel Vetter]

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drm-intel.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drm-intel.rst b/drm-intel.rst
index 90120933cb57..dc1393bbec21 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -142,6 +142,12 @@ release. There are no fast paths.
 For predictions on the future merge windows and releases, see
 http://phb-crystal-ball.org/.
 
+Tooling
+=======
+
+drm-intel git repositories are managed with dim_:
+
+.. _dim: dim.html
 
 Copyright
 =========
-- 
2.5.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 2/3] drm-intel: Add link to dim manpage

[Jani Nikula]

On Wed, 21 Oct 2015, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drm-intel.rst | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drm-intel.rst b/drm-intel.rst
> index 90120933cb57..dc1393bbec21 100644
> --- a/drm-intel.rst
> +++ b/drm-intel.rst
> @@ -142,6 +142,12 @@ release. There are no fast paths.
>  For predictions on the future merge windows and releases, see
>  http://phb-crystal-ball.org/.
>  
> +Tooling
> +=======
> +
> +drm-intel git repositories are managed with dim_:
> +
> +.. _dim: dim.html

Looks legit, but I trust you actually checked the output. I didn't. ;)

The only minor drawback is that I tried to make the resulting
drm-intel.html output standalone (embedded svg instead of png, wavedrom
stuff embedded) and this now references another file. Oh well.

Acks to all patches.


>  
>  Copyright
>  =========
> -- 
> 2.5.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 3/3] Update .gitignore

[Daniel Vetter]

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0f7a8e547057..e2bd6b63fa03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+drm-intel-flow.svg
+*.html
 .*
 *~
-- 
2.5.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx