Script to help compare old commits

This commit is contained in:
Clebert Suconic 2016-08-29 11:50:12 -04:00
parent 6a1a1b085f
commit 2ef79f66d9
2 changed files with 37 additions and 0 deletions

View File

@ -19,3 +19,13 @@ Credit should be given to those developers who contributed to the HornetQ projec
- Adrian Brock
For more information please visit the [HornetQ GitHub project](https://github.com/hornetq/hornetq/tree/apache-donation).
Rebasing original donation
==========================
It may be useful to look at the donation history combined with the artemis history. It is the case when eventually looking at old changes.
For that there is a script that will rebase master against the donation branch under master/scripts:
- rebase-donation.sh

27
scripts/rebase-donation.sh Executable file
View File

@ -0,0 +1,27 @@
#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# 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 rebase donation
git remote rm hornetq
git branch -D donation