From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [dim PATCH v2 1/7] dim: rename rebuild-nightly to rebuild-tip
Date: Thu, 24 Nov 2016 17:32:34 +0200 [thread overview]
Message-ID: <1480001560-18790-1-git-send-email-jani.nikula@intel.com> (raw)
Keep update-branches as an alias.
Signed-off-by: Jani Nikula <jani.nikula@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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-11-24 15:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-24 15:32 Jani Nikula [this message]
2016-11-24 15:32 ` [dim PATCH v2 2/7] dim: fix references to anything "nightly" in dim and documentation Jani Nikula
2016-11-24 15:32 ` [dim PATCH v2 3/7] dim: do not do local variable assignments in declaration Jani Nikula
2016-11-24 15:37 ` Jani Nikula
2016-11-24 15:32 ` [dim PATCH v2 4/7] dim: return exit status instead of actually exiting from url_to_remote Jani Nikula
2016-11-24 15:32 ` [dim PATCH v2 5/7] dim: fix list-upstreams when not in a git repo or with a drm upstream in place Jani Nikula
2016-11-24 15:32 ` [dim PATCH v2 6/7] dim: check positional parameter on dim fixes and cite Jani Nikula
2016-11-24 15:32 ` [dim PATCH v2 7/7] dim: unify rebuild fetch/merge messages Jani Nikula
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=1480001560-18790-1-git-send-email-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox