Re: [git-users] Rebasing large commit-set including merges

2013-01-18 Thread Stefan Schulze
Hi Michael, thank you for your answer. After playing with git grafts and "git filter-tags" according to your suggestion, it causes some different issues. I think, I gave to less information about the situation, so I created a complete new thread (the root of the problem seems to be something d

Re: [git-users] Rebasing large commit-set including merges

2013-01-17 Thread Michael Haggerty
On 01/14/2013 01:59 PM, Stefan Schulze wrote: > I try to rebase our whole history (~1500 commits) onto a quite empty > branch, only including a single commit (creating the base-directory - so > there is nothing conflicting in there). [...] > > Can you tell me, where I missed something? If you know

[git-users] Rebasing large commit-set including merges

2013-01-14 Thread Stefan Schulze
Hi, I try to rebase our whole history (~1500 commits) onto a quite empty branch, only including a single commit (creating the base-directory - so there is nothing conflicting in there). I want to do this, because our project was developed on a git-repository but now we have to make our stuff a