[Intel-gfx] [dim PATCH v2 1/7] dim: rename rebuild-nightly to rebuild-tip

Jani Nikula jani.nikula at intel.com
Thu Nov 24 15:32:34 UTC 2016


Keep update-branches as an alias.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 dim     | 5 +++--
 dim.rst | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dim b/dim
index 0c48e1e404f7..0acfb59a3fc2 100755
--- a/dim
+++ b/dim
@@ -376,7 +376,8 @@ function dim_revert_rerere
 	rm `rr_cache_dir`/* -Rf
 }
 
-function dim_rebuild_nightly
+dim_alias_rebuild_nightly=rebuild-tip
+function dim_rebuild_tip
 {
 	local integration_branch=drm-tip
 	local specfile=`mktemp`
@@ -514,7 +515,7 @@ function dim_push_branch
 	update_linux_next $branch drm-intel-next-queued drm-intel-next-fixes drm-intel-fixes
 	update_linux_next $branch drm-misc-next drm-misc-next-fixes drm-misc-fixes
 
-	dim_rebuild_nightly
+	dim_rebuild_tip
 }
 
 dim_alias_pq=push-queued
diff --git a/dim.rst b/dim.rst
index bde160056023..bc8cb160bf1f 100644
--- a/dim.rst
+++ b/dim.rst
@@ -85,10 +85,9 @@ always maintained from the same machine, even if different branches are
 maintained on different machines (by different maintainers), there's no need to
 run this command.
 
-rebuild-nightly
----------------
-Rebuilds the nightly branch. Useful when ad-hoc trees are
-included in -nightly.
+rebuild-tip
+-----------
+Rebuild and push the integration tree.
 
 revert-rerere *rerere-cache-commit-ish*
 ---------------------------------------
-- 
2.1.4



More information about the Intel-gfx mailing list