On Mon, 28 Mar 2011, Nicolas Pitre wrote: > Let's see... I currently have: > > $ git diff --shortstat old_linaro-2.6.38..new_linaro-2.6.38 > 805 files changed, 55412 insertions(+), 25203 deletions(-) > > $ git diff --shortstat old_linaro-2.6.38..v2.6.38 > 966 files changed, 15985 insertions(+), 40994 deletions(-) > > $ git diff --shortstat v2.6.38..new_linaro-2.6.38 > 1586 files changed, 93151 insertions(+), 37933 deletions(-) > > Given that I want to preserve the history, what I can do is to apply the > old->new diff to the old branch as this is the smallest diff, and then > merge the new branch on top to tie the new history to it. That should > remove the need for any rebase in the technical sense of the word, but > that would still cause quite a road bump next time you pull that. Is it > worth it? To me this doesn't make a huge difference.
So that's what I just did. No rebase needed, however expect quite a bump next time you pull/merge depending on your work area in the tree. Nicolas _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
