You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/30 15:10:44 UTC
activemq-artemis git commit: small tweak on rebase script
Repository: activemq-artemis
Updated Branches:
refs/heads/master e3af370c2 -> 6bb156cbd
small tweak on rebase script
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6bb156cb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6bb156cb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6bb156cb
Branch: refs/heads/master
Commit: 6bb156cbdec5f4e0dfc3d99a6401c388b72420f0
Parents: e3af370
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 30 10:44:10 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 30 10:49:11 2016 -0400
----------------------------------------------------------------------
scripts/rebase-donation.sh | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6bb156cb/scripts/rebase-donation.sh
----------------------------------------------------------------------
diff --git a/scripts/rebase-donation.sh b/scripts/rebase-donation.sh
index 6cb4a10..1cec299 100755
--- a/scripts/rebase-donation.sh
+++ b/scripts/rebase-donation.sh
@@ -18,10 +18,15 @@
# more information about this script at https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/history.md
-git remote add hornetq https://github.com/hornetq/hornetq.git
-git fetch hornetq
-git checkout hornetq/apache-donation -B donation
-git checkout apache/master -B master-donation
+git remote add -f temp-hornetq https://github.com/hornetq/hornetq.git
+git remote add -f temp-upstream https://github.com/apache/activemq-artemis.git
+
+set -e
+git fetch temp-hornetq
+git fetch temp-upstream
+git checkout temp-hornetq/apache-donation -B donation
+git checkout temp-upstream/master -B master-donation
git rebase donation
-git remote rm hornetq
+git remote rm temp-hornetq
+git remote rm temp-upstream
git branch -D donation